Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Oct 2015 00:28:24 +0000 (UTC)
From:      "Simon J. Gerraty" <sjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r288965 - head/share/mk
Message-ID:  <201510070028.t970SOKJ096656@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510070028.t970SOKJ096656>