===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.100
retrieving revision 1.101
diff -c -r1.100 -r1.101
*** src/Makefile	2004/02/27 17:36:11	1.100
--- src/Makefile	2004/03/31 19:13:04	1.101
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.100 2004/02/27 17:36:11 deraadt Exp $
  
  #
  # For more information on building in tricky environments, please see
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.101 2004/03/31 19:13:04 mickey Exp $
  
  #
  # For more information on building in tricky environments, please see
***************
*** 198,218 ****
  .else
  	(cd ${.CURDIR}/gnu/usr.bin/gas; \
  	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
  	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/as \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/as
  	(cd ${.CURDIR}/gnu/usr.bin/ld; \
  	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOPIC= NOMAN= depend all; \
  	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOPIC= NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/ld \
--- 198,214 ----
***************
*** 232,257 ****
  	(cd ${.CURDIR}/usr.bin/strip; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/strip \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
  	(cd ${.CURDIR}/usr.bin/nm; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/nm \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
  	ln -sf ${CROSSDIR}/usr/bin/size \
! 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
! .endif
  	@for cmd in ${BINUTILS}; do \
  	 if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \
  	 -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
--- 228,250 ----
  	(cd ${.CURDIR}/usr.bin/strip; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/strip \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
+ .endif
  	(cd ${.CURDIR}/usr.bin/nm; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/nm \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
  	ln -sf ${CROSSDIR}/usr/bin/size \
! 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size
  	@for cmd in ${BINUTILS}; do \
  	 if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \
  	 -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
***************
*** 268,281 ****
  ${CROSSGCC}:		${CROSSBINUTILS}
  	(cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \
  	    /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
! 	    --prefix ${CROSSDIR}/usr \
  	    --target `cat ${CROSSDIR}/TARGET_CANON` \
  	    --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
  	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \
! 	    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" \
  	    build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
  	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \
  	    ${CROSSDIR}/usr/bin/cc
--- 261,279 ----
  ${CROSSGCC}:		${CROSSBINUTILS}
  	(cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \
  	    /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
! 	    --with-gnu-as --with-gnu-ld --prefix ${CROSSDIR}/usr \
  	    --target `cat ${CROSSDIR}/TARGET_CANON` \
+ 	    --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)
  	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \
  	    ${CROSSDIR}/usr/bin/cc