From cb1e3c19f0c20bee1980972eb4a13298770a6bb5 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Mon, 6 Jun 2005 09:39:46 +0000
Subject: [PATCH] Allow to override the compiler, linker, and assembler used to
 build 32-bit shim libraries on amd64.

---
 Makefile.inc1 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 45e25377ff96..612ed83cb5c4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -227,21 +227,21 @@ LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		MACHINE_ARCH=i386 \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
-		CC="cc ${LIB32CC}" \
-		CXX="c++ ${LIB32CXX}" \
-		OBJC="cc ${LIB32OBJC}" \
-		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
-		AS="as --32" \
+		CC="${CC} ${LIB32CC}" \
+		CXX="${CXX} ${LIB32CXX}" \
+		OBJC="${OBJC} ${LIB32OBJC}" \
+		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+		AS="${AS} --32" \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
 		-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML \
-		CC="cc ${LIB32CC}" \
-		CXX="c++ ${LIB32CXX}" \
-		OBJC="cc ${LIB32OBJC}" \
-		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
-		AS="as --32" \
+		CC="${CC} ${LIB32CC}" \
+		CXX="${CXX} ${LIB32CXX}" \
+		OBJC="${OBJC} ${LIB32OBJC}" \
+		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+		AS="${AS} --32" \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32
 .endif