svn commit: r250859 - head

[Brooks Davis]

Author: brooks
Date: Tue May 21 16:58:23 2013
New Revision: 250859
URL: http://svnweb.freebsd.org/changeset/base/250859

Log:
  Restore the ability to build on systems with 32-bit compat when
  the system compiler is not clang.  clang and gcc appear to differ
  signficantly in their interpretation of -isystem and --sysroot.  Further
  work is likely required to support an external gcc.
  
  Reported by:	andreast, fidaj at ukr.net, sergey.dyatko at gmail.com

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue May 21 16:34:44 2013	(r250858)
+++ head/Makefile.inc1	Tue May 21 16:58:23 2013	(r250859)
@@ -366,10 +366,12 @@ LIB32WMAKEFLAGS=	\
 
 
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \
-		--sysroot=${WORLDTMP} \
 		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
+.if ${XCC:M/*}
+LIB32FLAGS+=		--sysroot=${WORLDTMP}
+.endif
 
 # Yes, the flags are redundant.
 LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \