===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -r1.24 -r1.28
--- src/Makefile	1998/02/15 20:56:40	1.24
+++ src/Makefile	1998/05/04 21:28:18	1.28
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 1998/02/15 20:56:40 niklas Exp $
+#	$OpenBSD: Makefile,v 1.28 1998/05/04 21:28:18 mickey Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -93,7 +93,8 @@
 	-mkdir -p ${CROSSDIR}/usr/include
 	echo _MACHINE_ARCH | \
 	    cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
-	    ${CPP} -E |sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
+	    ${CPP} -E -I${.CURDIR}/sys/arch | \
+	    sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
 	eval `grep '^osr=' sys/conf/newvers.sh`; \
 	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
 	   ${CROSSDIR}/TARGET_CANON
@@ -102,7 +103,14 @@
 	${MAKE} MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
 	    DESTDIR=${CROSSDIR} includes
 
-cross-binutils:
+.if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \
+    ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa"
+cross-binutils: cross-binutils-new
+.else
+cross-binutils: cross-binutils-old
+.endif
+
+cross-binutils-new:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	export BSDSRCDIR=`pwd`; \
 	    (cd ${.CURDIR}/gnu/usr.bin/binutils; \
@@ -110,7 +118,7 @@
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} -f Makefile.bsd-wrapper obj); \
 	    (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \
-	    ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
+	    /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
 	    ${MAKE} && ${MAKE} install)
@@ -118,9 +126,12 @@
 	    ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \
 	    ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder
 
+cross-binutils-old: cross-gas cross-ar cross-ld
+
 cross-gas:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
+	-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin
 	(cd gnu/usr.bin/gas; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
@@ -129,9 +140,45 @@
 	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE})
 	(cd gnu/usr.bin/gas; \
+	    TARGET_MACHINE_ARCH=${TARGET} \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
+	ln -sf ${CROSSDIR}/usr/bin/as \
+	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/as
 
+# Not yet functional
+cross-ld:
+	-mkdir -p ${CROSSDIR}/usr/obj
+	-mkdir -p ${CROSSDIR}/usr/bin
+	(cd gnu/usr.bin/ld; \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} obj)
+	(cd gnu/usr.bin/ld; \
+	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN=)
+	(cd gnu/usr.bin/ld; \
+	    TARGET_MACHINE_ARCH=${TARGET} \
+	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= install)
+	ln -sf ${CROSSDIR}/usr/bin/ld \
+	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ld
+
+# Not yet tested for compatibility with any target
+cross-ar:
+	-mkdir -p ${CROSSDIR}/usr/obj
+	-mkdir -p ${CROSSDIR}/usr/bin
+	(cd usr.bin/ar; \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} obj)
+	(cd usr.bin/ar; MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=)
+	(cd usr.bin/ar; \
+	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= install)
+	ln -sf ${CROSSDIR}/usr/bin/ar \
+	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ar
+
 cross-gcc:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	(cd gnu/usr.bin/gcc; \
@@ -139,12 +186,13 @@
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} -f Makefile.bsd-wrapper obj)
 	(cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \
-	    ${.CURDIR}/gnu/usr.bin/gcc/configure \
+	    /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
-	    ${MAKE} BISON=yacc LANGUAGES=c \
+	    ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \
 	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
-	    ${MAKE} LANGUAGES=c install)
+	    ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \
+	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" install)
 .endif
 
 .include <bsd.subdir.mk>