=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.27 retrieving revision 1.37 diff -u -r1.27 -r1.37 --- src/Makefile 1998/04/25 06:42:44 1.27 +++ src/Makefile 1998/05/18 17:40:00 1.37 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 1998/04/25 06:42:44 niklas Exp $ +# $OpenBSD: Makefile,v 1.37 1998/05/18 17:40:00 mickey Exp $ # # For more information on building in tricky environments, please see @@ -85,9 +85,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,11 +106,14 @@ ${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} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa" cross-binutils: cross-binutils-new .else cross-binutils: cross-binutils-old @@ -112,6 +121,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,74 +135,183 @@ ${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-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \ + cross-ranlib cross-nm 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; \ + (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) 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; \ + (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 \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ar +cross-ranlib: + -mkdir -p ${CROSSDIR}/usr/obj + -mkdir -p ${CROSSDIR}/usr/bin + (cd ${.CURDIR}/usr.bin/ranlib; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) + ln -sf ${CROSSDIR}/usr/bin/ranlib \ + ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ranlib + +cross-strip: + -mkdir -p ${CROSSDIR}/usr/obj + -mkdir -p ${CROSSDIR}/usr/bin + (cd ${.CURDIR}/usr.bin/strip; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${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 \ + ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip + +cross-size: + -mkdir -p ${CROSSDIR}/usr/obj + -mkdir -p ${CROSSDIR}/usr/bin + (cd ${.CURDIR}/usr.bin/size; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${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 \ + ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size + +cross-nm: + -mkdir -p ${CROSSDIR}/usr/obj + -mkdir -p ${CROSSDIR}/usr/bin + (cd ${.CURDIR}/usr.bin/nm; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${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 \ + ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm + 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