Date: Wed, 13 Oct 2004 22:21:15 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 63178 for review Message-ID: <200410132221.i9DMLFFu044865@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63178 Change 63178 by peter@peter_melody on 2004/10/13 22:20:37 checkpoint. Note. do not forget obj. Affected files ... .. //depot/projects/hammer/Makefile.inc1#65 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#65 (text+ko) ==== @@ -204,7 +204,7 @@ # 32 bit world CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 -CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32BIT}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -377,10 +377,16 @@ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} hierarchy + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} obj cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} includes - cd ${.CURDIR}/lib/libncurses; ${MAKE} build-tools - cd ${.CURDIR}/lib/libmagic; ${MAKE} build-tools + cd ${.CURDIR}/lib/libncurses; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools + cd ${.CURDIR}/lib/libmagic; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries +.for _t in obj depend all install + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 MACHINE_ARCH=i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 \ + ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS} -DCOMPAT_32BIT" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t} +.endfor _install32:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410132221.i9DMLFFu044865>