From owner-svn-src-head@FreeBSD.ORG  Tue May 21 16:58:24 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A249FDC;
 Tue, 21 May 2013 16:58:24 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 95295E86;
 Tue, 21 May 2013 16:58:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4LGwNjW070772;
 Tue, 21 May 2013 16:58:23 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4LGwNgl070771;
 Tue, 21 May 2013 16:58:23 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201305211658.r4LGwNgl070771@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 21 May 2013 16:58:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250859 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 May 2013 16:58:24 -0000

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@ukr.net, sergey.dyatko@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 \