svn commit: r248348 - stable/9

[Brooks Davis]

Author: brooks
Date: Fri Mar 15 20:26:51 2013
New Revision: 248348
URL: http://svnweb.freebsd.org/changeset/base/248348

Log:
  MFC r241311:
  
  Change 32-bit library builds by removing use of make -E and passing AS,
  CC, CXX and LD on the commandline of the sub-make instead of in the
  environment of the sub-make.

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Fri Mar 15 20:22:20 2013	(r248347)
+++ stable/9/Makefile.inc1	Fri Mar 15 20:26:51 2013	(r248348)
@@ -293,9 +293,10 @@ LIB32CPUFLAGS=	-march=i686 -mmmx -msse -
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
-		MACHINE_CPU="i686 mmx sse sse2" \
-		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
-		AS="${AS} --32"
+		MACHINE_CPU="i686 mmx sse sse2"
+LIB32WMAKEFLAGS=	\
+		AS="${AS} --32" \
+		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
 
 .elif ${TARGET_ARCH} == "powerpc64"
 .if empty(TARGET_CPUTYPE)
@@ -303,7 +304,8 @@ LIB32CPUFLAGS=	-mcpu=powerpc
 .else
 LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
-LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc \
+LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
+LIB32WMAKEFLAGS=	\
 		LD="${LD} -m elf32ppc"
 .endif
 
@@ -320,16 +322,20 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTR
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
-		CC="${CC} ${LIB32FLAGS}" \
-		CXX="${CXX} ${LIB32FLAGS}" \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \
 		COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
+LIB32WMAKEFLAGS+=	\
+		CC="${CC} ${LIB32FLAGS}" \
+		CXX="${CXX} ${LIB32FLAGS}" \
+		DESTDIR=${LIB32TMP} \
+		-DCOMPAT_32BIT \
+		-DNO_CPU_CFLAGS \
+		-DNO_CTF \
+		-DNO_LINT
 
-LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
-		-DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \
-		DESTDIR=${LIB32TMP}
+LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
+		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
 		${IMAKE_INSTALL}
 .endif