=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.32 retrieving revision 1.39 diff -u -r1.32 -r1.39 --- src/Makefile 1998/05/16 20:56:52 1.32 +++ src/Makefile 1998/08/28 22:46:02 1.39 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 1998/05/16 20:56:52 niklas Exp $ +# $OpenBSD: Makefile,v 1.39 1998/08/28 22:46:02 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= cross-tools" +# (where 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/ +# directory. +# .include # for NOMAN, if it's there. @@ -131,10 +138,34 @@ /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \ --prefix ${CROSSDIR}/usr \ --target `cat ${CROSSDIR}/TARGET_CANON` && \ - ${MAKE} && ${MAKE} install) + ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install) ${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 @@ -143,7 +174,7 @@ -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; \ @@ -158,7 +189,7 @@ 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; \ @@ -173,7 +204,7 @@ 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; \ @@ -186,7 +217,7 @@ 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; \ @@ -199,7 +230,7 @@ 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; \ @@ -213,7 +244,7 @@ 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; \ @@ -227,7 +258,7 @@ 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; \ @@ -241,7 +272,7 @@ cross-gcc: -mkdir -p ${CROSSDIR}/usr/obj -mkdir -p ${CROSSDIR}/usr/bin - cd gnu/usr.bin/gcc; \ + cd ${.CURDIR}/gnu/usr.bin/gcc; \ BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} -f Makefile.bsd-wrapper obj @@ -260,8 +291,8 @@ 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#' usr.bin/cpp/cpp.sh \ - >${CROSSDIR}/usr/bin/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 @@ -271,7 +302,7 @@ -mkdir -p ${CROSSDIR}/var/db MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ export MACHINE MACHINE_ARCH; \ - (cd lib; \ + (cd ${.CURDIR}/lib; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ @@ -279,12 +310,13 @@ (cd $$lib; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN=; \ - DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} NOMAN= install); \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + DESTDIR=${CROSSDIR} ${MAKE} NOMAN= install); \ done; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ - MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \ - SKIPDIR=libocurses/PSD.doc ${MAKE} NOMAN= install) + ${CROSSENV} 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