From owner-svn-src-head@freebsd.org  Fri May 27 23:03:30 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 217C9B4DDA7;
 Fri, 27 May 2016 23:03:30 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF3781104;
 Fri, 27 May 2016 23:03:29 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4RN3TZN099058;
 Fri, 27 May 2016 23:03:29 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4RN3Tx6099057;
 Fri, 27 May 2016 23:03:29 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201605272303.u4RN3Tx6099057@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 27 May 2016 23:03:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300885 - 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.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2016 23:03:30 -0000

Author: bdrewery
Date: Fri May 27 23:03:28 2016
New Revision: 300885
URL: https://svnweb.freebsd.org/changeset/base/300885

Log:
  Libcompat: Only pass -isystem =/usr/include for external GCC.
  
  This is the same as the main build logic.  GCC with a cross-compiler
  requires using -isystem to =/usr/include to get the search order
  correct.
  
  Reported by:	dim, asomers
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.libcompat

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Fri May 27 22:56:00 2016	(r300884)
+++ head/Makefile.libcompat	Fri May 27 23:03:28 2016	(r300885)
@@ -72,10 +72,9 @@ LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
 # -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for
 # Clang/GCC.
 LIBCOMPATCFLAGS+=	-B${LIBCOMPATTMP}/usr/lib${libcompat}
+.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
 # GCC requires -isystem when using a cross-compiler.
 LIBCOMPATCFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include
-
-.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
 # Force using libc++ for external GCC.
 LIBCOMPATCXXFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
 			-nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++