=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.68 retrieving revision 1.70 diff -u -r1.68 -r1.70 --- src/Makefile 2001/06/26 15:33:28 1.68 +++ src/Makefile 2001/08/31 10:54:59 1.70 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.68 2001/06/26 15:33:28 hin Exp $ +# $OpenBSD: Makefile,v 1.70 2001/08/31 10:54:59 art Exp $ # # For more information on building in tricky environments, please see @@ -95,9 +95,6 @@ ${MAKE} -f Makefile.bsd-wrapper depend && \ ${MAKE} -f Makefile.bsd-wrapper perl.lib && \ exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib -.if (${MACHINE_ARCH} == "mips") - ldconfig -R -.endif ${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install .if !defined(TARGET) @@ -117,22 +114,20 @@ HOSTCC=cc CROSSPATH= ${PATH}:${CROSSDIR}/usr/bin +.if (${TARGET} == "sparc64") +CROSSENV+= CPPFLAGS=-D__arch64__ +CPPFLAGS=-D__arch64__ +.endif + cross-helpers: - mkdir -p ${CROSSDIR} + @-mkdir -p ${CROSSDIR} echo _MACHINE_ARCH | \ cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \ - ${CPP} -E -I${.CURDIR}/sys/arch | \ + ${CPP} ${CPPFLAGS} -E -I${.CURDIR}/sys/arch | \ sed -n '$$p' >${CROSSDIR}/TARGET_ARCH -# GROSS KLUDGE MACHINE_ARCH is mips, but we use mipsel for gnu tools. -.if ${TARGET} == "arc" || ${TARGET} == "pmax" eval `grep '^osr=' sys/conf/newvers.sh`; \ - sed "s/\$$/el-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \ - ${CROSSDIR}/TARGET_CANON -.else - eval `grep '^osr=' sys/conf/newvers.sh`; \ sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \ ${CROSSDIR}/TARGET_CANON -.endif cross-dirs: ${CROSSDIR}/stamp.dirs @-mkdir -p ${CROSSDIR} @@ -164,7 +159,8 @@ ${MAKE} DESTDIR=${CROSSDIR} includes .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \ - ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa" + ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa" || \ + ${TARGET} == "sparc64" cross-binutils: cross-binutils-new .else cross-binutils: cross-binutils-old