From owner-svn-src-all@freebsd.org  Wed Oct  7 00:28:25 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 A01749D0F79;
 Wed,  7 Oct 2015 00:28:25 +0000 (UTC) (envelope-from sjg@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 6CEC77F7;
 Wed,  7 Oct 2015 00:28:25 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t970SOKi096657;
 Wed, 7 Oct 2015 00:28:24 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t970SOKJ096656;
 Wed, 7 Oct 2015 00:28:24 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201510070028.t970SOKJ096656@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 7 Oct 2015 00:28:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288965 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2015 00:28:25 -0000

Author: sjg
Date: Wed Oct  7 00:28:24 2015
New Revision: 288965
URL: https://svnweb.freebsd.org/changeset/base/288965

Log:
  Do not assume host toolchain supports sysroot

Modified:
  head/share/mk/local.init.mk

Modified: head/share/mk/local.init.mk
==============================================================================
--- head/share/mk/local.init.mk	Wed Oct  7 00:24:27 2015	(r288964)
+++ head/share/mk/local.init.mk	Wed Oct  7 00:28:24 2015	(r288965)
@@ -9,11 +9,12 @@
 .endif
 .endif
 
-.if ${MK_SYSROOT} == "yes" && !empty(SYSROOT)
+.if ${MK_SYSROOT} == "yes" && !empty(SYSROOT) && ${MACHINE} != "host"
 CFLAGS_LAST+= --sysroot=${SYSROOT}
 CXXFLAGS_LAST+= --sysroot=${SYSROOT}
 LDADD+= --sysroot=${SYSROOT}
 .elif ${MK_STAGING} == "yes"
+CFLAGS+= -nostdinc
 CFLAGS+= -I${STAGE_INCLUDEDIR}
 LDADD+= -L${STAGE_LIBDIR}
 .endif