summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-03-25 22:36:32 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-03-25 22:36:32 +0000
commit0f40e82d352beb9d2a8fbbe09cc2a74ecbcbd042 (patch)
tree415929828dd04e94a27be9f4a64000538c242d66 /Makefile.inc1
parent1e6e9df850f70b7ac5efc885365632c32bdfc0b4 (diff)
downloadFreeBSD-src-0f40e82d352beb9d2a8fbbe09cc2a74ecbcbd042.zip
FreeBSD-src-0f40e82d352beb9d2a8fbbe09cc2a74ecbcbd042.tar.gz
WITHOUT_TOOLCHAIN: Fix includes not being staged in WORLDTMP.
This has been the case since r264930 and r274662. Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc14
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index a01286a..71006bc 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -623,9 +623,9 @@ _includes:
# Special handling for SUBDIR_OVERRIDE in buildworld as they most likely need
# headers from default SUBDIR. Do SUBDIR_OVERRIDE includes last.
${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \
- includes
+ MK_INCLUDES=yes includes
.if !empty(SUBDIR_OVERRIDE) && make(buildworld)
- ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes
+ ${_+_}cd ${.CURDIR}; ${WMAKE} MK_INCLUDES=yes SHARED=symlinks includes
.endif
_libraries:
@echo
OpenPOWER on IntegriCloud