[Midnightbsd-cvs] src [8977] trunk/Makefile.inc1: change 32bit builds to switch to sub make vs -E

[laffer1 at midnightbsd.org]

Revision: 8977
          http://svnweb.midnightbsd.org/src/?rev=8977
Author:   laffer1
Date:     2016-09-29 21:10:03 -0400 (Thu, 29 Sep 2016)
Log Message:
-----------
change 32bit builds to switch to sub make vs -E

Modified Paths:
--------------
    trunk/Makefile.inc1

Modified: trunk/Makefile.inc1
===================================================================
--- trunk/Makefile.inc1	2016-09-30 01:05:21 UTC (rev 8976)
+++ trunk/Makefile.inc1	2016-09-30 01:10:03 UTC (rev 8977)
@@ -293,9 +293,10 @@
 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" \
+		MACHINE_CPU="i686 mmx sse sse2" 
+LIB32WMAKEFLAGS=	\
 		AS="${AS} --32"
+		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
 .endif
 
 
@@ -311,18 +312,22 @@
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
-		CC="${CC} ${LIB32FLAGS}" \
-		CXX="${CXX} ${LIB32FLAGS}" \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \
 		LIBPRIVATEDIR=/usr/lib32/private \
 		MACHINE_INCLUDES="${WORLDTMP}/include" \
 		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