===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.57
retrieving revision 1.58
diff -c -r1.57 -r1.58
*** src/Makefile.cross	2012/11/13 20:51:57	1.57
--- src/Makefile.cross	2012/11/13 20:59:43	1.58
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.57 2012/11/13 20:51:57 miod Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
--- 1,4 ----
! # $OpenBSD: Makefile.cross,v 1.58 2012/11/13 20:59:43 miod Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
***************
*** 350,362 ****
  	    --enable-languages="c,c++" --enable-cpp --disable-nls \
  	    --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
  	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \
! 	    CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \
  	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
  	    DEMANGLER_PROG= DEMANGLE_H= LDFLAGS="${LDSTATIC}" build_infodir=. \
  	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
  	    ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" LDFLAGS="${LDSTATIC}" \
  	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
! 	    CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \
  	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
  	    build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
  	mv -f ${CROSSDIR}/usr/bin/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
--- 350,362 ----
  	    --enable-languages="c,c++" --enable-cpp --disable-nls \
  	    --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
  	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \
! 	    CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
  	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
  	    DEMANGLER_PROG= DEMANGLE_H= LDFLAGS="${LDSTATIC}" build_infodir=. \
  	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
  	    ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" LDFLAGS="${LDSTATIC}" \
  	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
! 	    CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
  	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
  	    build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
  	mv -f ${CROSSDIR}/usr/bin/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp