PERFORCE change 64384 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=64384

Change 64384 by peter at peter_daintree on 2004/11/05 22:52:17

	pass COMPAT_32BIT to make and compiler.

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#69 edit

Differences ...

==== //depot/projects/hammer/Makefile.inc1#69 (text+ko) ====

@@ -203,9 +203,10 @@
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 # 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${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
-OBJCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/objc -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
+CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
+CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
+OBJCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/objc -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
+
 LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -218,7 +219,7 @@
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32
 
-LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DNO_BIND -DNOMAN -DNODOC -DNOINFO \
+LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT -DNO_BIND -DNOMAN -DNODOC -DNOINFO \
 		CC="cc ${CCARGS}" \
 		CXX="c++ ${CXXARGS}" \
 		OBJC="cc ${OBJCARGS}" \
@@ -388,7 +389,7 @@
 .for _t in obj depend all
 	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}
+	    ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS}" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t}
 .endfor
 
 _install32: