===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.29
retrieving revision 1.38
diff -u -r1.29 -r1.38
--- src/Makefile	1998/05/11 07:43:12	1.29
+++ src/Makefile	1998/05/18 18:29:07	1.38
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 1998/05/11 07:43:12 niklas Exp $
+#	$OpenBSD: Makefile,v 1.38 1998/05/18 18:29:07 mickey Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -19,6 +19,13 @@
 #
 # 3) If you are reasonably sure that things will compile OK, use the
 # "make build" target supplied here. Good luck.
+#
+# 4) If you want to setup a cross-build environment, there is a "cross-tools"
+# target available which upon completion of "make TARGET=<target> cross-tools" 
+# (where <target> is one of the names in the /sys/arch directory) will produce
+# a set of compilation tools along with the includes in the /usr/cross/<target>
+# directory.
+#
 
 .include <bsd.own.mk>	# for NOMAN, if it's there.
 
@@ -85,9 +92,15 @@
 cross-tools:
 	echo "TARGET must be set"; exit 1
 .else
-cross-tools:	cross-helpers cross-includes cross-binutils cross-gcc
+cross-tools:	cross-helpers cross-includes cross-binutils cross-gcc cross-lib
 
 CROSSDIR=	${DESTDIR}/usr/cross/${TARGET}
+CROSSENV=	AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \
+		CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \
+		LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
+		RANLIB=${CROSSDIR}/usr/bin/ranlib \
+		SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
+		HOSTCC=cc
 
 cross-helpers:
 	-mkdir -p ${CROSSDIR}/usr/include
@@ -100,8 +113,11 @@
 	   ${CROSSDIR}/TARGET_CANON
 
 cross-includes:
+	-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
 	${MAKE} MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
 	    DESTDIR=${CROSSDIR} includes
+	ln -sf ${CROSSDIR}/usr/include \
+	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
 
 .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \
     ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa"
@@ -112,6 +128,7 @@
 
 cross-binutils-new:
 	-mkdir -p ${CROSSDIR}/usr/obj
+	-mkdir -p ${CROSSDIR}/usr/bin
 	export BSDSRCDIR=`pwd`; \
 	    (cd ${.CURDIR}/gnu/usr.bin/binutils; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
@@ -125,6 +142,30 @@
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \
 	    ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-as \
+	    ${CROSSDIR}/usr/bin/as
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ar \
+	    ${CROSSDIR}/usr/bin/ar
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ld \
+	    ${CROSSDIR}/usr/bin/ld
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strip \
+	    ${CROSSDIR}/usr/bin/strip
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-size \
+	    ${CROSSDIR}/usr/bin/size
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ranlib \
+	    ${CROSSDIR}/usr/bin/ranlib
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-nm \
+	    ${CROSSDIR}/usr/bin/nm
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strings \
+	    ${CROSSDIR}/usr/bin/strings
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder \
+	    ${CROSSDIR}/usr/bin/lorder
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objcopy \
+	    ${CROSSDIR}/usr/bin/objcopy
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objdump \
+	    ${CROSSDIR}/usr/bin/objdump
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gdb \
+	    ${CROSSDIR}/usr/bin/gdb
 
 cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \
 	cross-ranlib cross-nm
@@ -133,32 +174,27 @@
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
 	-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin
-	(cd gnu/usr.bin/gas; \
+	(cd ${.CURDIR}/gnu/usr.bin/gas; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} obj)
-	(cd gnu/usr.bin/gas; \
+	    ${MAKE} obj; \
 	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE})
-	(cd gnu/usr.bin/gas; \
+	    ${MAKE}; \
 	    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; \
+	(cd ${.CURDIR}/gnu/usr.bin/ld; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} obj)
-	(cd gnu/usr.bin/ld; \
+	    ${MAKE} obj; \
 	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN=)
-	(cd gnu/usr.bin/ld; \
+	    ${MAKE} NOMAN=; \
 	    TARGET_MACHINE_ARCH=${TARGET} \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
@@ -168,12 +204,11 @@
 cross-ar:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
-	(cd usr.bin/ar; \
+	(cd ${.CURDIR}/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; \
+	    ${MAKE} obj; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ar \
@@ -182,12 +217,11 @@
 cross-ranlib:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
-	(cd usr.bin/ranlib; \
+	(cd ${.CURDIR}/usr.bin/ranlib; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} obj)
-	(cd usr.bin/ranlib; MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=)
-	(cd usr.bin/ranlib; \
+	    ${MAKE} obj; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ranlib \
@@ -196,14 +230,12 @@
 cross-strip:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
-	(cd usr.bin/strip; \
+	(cd ${.CURDIR}/usr.bin/strip; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} obj)
-	(cd usr.bin/strip; \
+	    ${MAKE} obj; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=)
-	(cd usr.bin/strip; \
+	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/strip \
@@ -212,13 +244,12 @@
 cross-size:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
-	(cd usr.bin/size; \
+	(cd ${.CURDIR}/usr.bin/size; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} obj)
-	(cd usr.bin/size; MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=)
-	(cd usr.bin/size; \
+	    ${MAKE} obj; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/size \
@@ -227,12 +258,12 @@
 cross-nm:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
-	(cd usr.bin/nm; \
+	(cd ${.CURDIR}/usr.bin/nm; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} obj)
-	(cd usr.bin/nm; MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=)
-	(cd usr.bin/nm; \
+	    ${MAKE} obj; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/nm \
@@ -240,18 +271,54 @@
 
 cross-gcc:
 	-mkdir -p ${CROSSDIR}/usr/obj
-	(cd gnu/usr.bin/gcc; \
+	-mkdir -p ${CROSSDIR}/usr/bin
+	cd ${.CURDIR}/gnu/usr.bin/gcc; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} -f Makefile.bsd-wrapper obj)
+	    ${MAKE} -f Makefile.bsd-wrapper obj
 	(cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \
 	    /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
 	    ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \
+	    build_infodir=. \
 	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
 	    ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \
-	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" install)
+	    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
+	CPP=`${CROSSDIR}/usr/bin/cc -print-libgcc-file-name | \
+	    sed 's/libgcc\.a/cpp/'`; \
+	    sed -e 's#/usr/libexec/cpp#'$$CPP'#' \
+	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
+	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp
+	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
+	chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp
+
+cross-lib:
+	-mkdir -p ${CROSSDIR}/usr/obj
+	-mkdir -p ${CROSSDIR}/usr/lib
+	-mkdir -p ${CROSSDIR}/var/db
+	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
+	export MACHINE MACHINE_ARCH; \
+	(cd ${.CURDIR}/lib; \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} obj; \
+	    for lib in csu libc; do \
+		(cd $$lib; \
+		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		    ${MAKE} NOMAN=; \
+		    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		    ${MAKE} NOMAN= install); \
+	    done; \
+	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
+	    SKIPDIR=libocurses/PSD.doc ${MAKE} NOMAN= install)
+	ln -sf ${CROSSDIR}/usr/lib \
+	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib
+
 .endif
 
 .include <bsd.subdir.mk>