summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2014-05-16 14:47:18 +0000
committersjg <sjg@FreeBSD.org>2014-05-16 14:47:18 +0000
commitaa628f3a574c7031d555f02aa06bb201e548cee4 (patch)
tree64701f4885b827c79d8be01c81668923f260768d /include
parent08e72f721803035f066c5914d842ed298fb79d4d (diff)
downloadFreeBSD-src-aa628f3a574c7031d555f02aa06bb201e548cee4.zip
FreeBSD-src-aa628f3a574c7031d555f02aa06bb201e548cee4.tar.gz
We want to use stage_includes as a hook, so use NO_STAGE_INCLUDES
in include/Makefile to suppress normal behavior
Diffstat (limited to 'include')
-rw-r--r--include/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/Makefile b/include/Makefile
index 8b896ba..274dd2c 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -121,7 +121,7 @@ _MARCHS+= x86
.if ${MK_STAGING} != "no"
# tell bsd.incs.mk that we have it covered
-stage_includes:
+NO_STAGE_INCLUDES=
.endif
.include <bsd.prog.mk>
@@ -371,3 +371,12 @@ symlinks:
.if ${MK_META_MODE} == "yes"
touch ${.TARGET}
.endif
+
+.if ${MACHINE} == "host"
+# we're here because we are building a sysroot...
+# we need MACHINE et al set correctly
+HOST_MACHINE!= uname -m
+HOST_MACHINE_ARCH!= uname -p
+MACHINE:= ${HOST_MACHINE}
+MACHINE_ARCH:= ${HOST_MACHINE_ARCH}
+.endif
OpenPOWER on IntegriCloud