buildworld + ccache trouble

[Dimitry Andric]

On 2010-09-15 14:44, Dmitry Krivenok wrote:
> I recently updated to r212634 and tried to build CURRENT tree with ccache.
...
> /usr/src/lib/csu/i386-elf/crt1_s.S:42: Error: `8(%ebp)' is not a valid
> 64 bit base/index expression

I assume this error occurs when building the 32-bit components on amd64.
If so, can you please try the attached patch?

It should fix the build32 stage with a non-default ${CC} setting.  This
also applies to building with clang, for instance.
-------------- next part --------------
diff --git a/Makefile.inc1 b/Makefile.inc1
index a08e4ca..66d074f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -299,15 +299,15 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
-		CC="${CC} ${LIB32FLAGS}" \
-		CXX="${CXX} ${LIB32FLAGS}" \
-		OBJC="${OBJC} ${LIB32FLAGS}" \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
 		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
-		-DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP}
+		-DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP} \
+		CC="${CC} ${LIB32FLAGS}" \
+		CXX="${CXX} ${LIB32FLAGS}" \
+		OBJC="${OBJC} ${LIB32FLAGS}"
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
 .endif