WITHOUT_TOOLCHAIN: Fix includes not being staged in WORLDTMP.

This has been the case since r264930 and r274662.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-03-25 22:36:32 +00:00
parent 11e49977a2
commit ac978f5a8f

View File

@ -623,9 +623,9 @@ _includes:
# Special handling for SUBDIR_OVERRIDE in buildworld as they most likely need # Special handling for SUBDIR_OVERRIDE in buildworld as they most likely need
# headers from default SUBDIR. Do SUBDIR_OVERRIDE includes last. # headers from default SUBDIR. Do SUBDIR_OVERRIDE includes last.
${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \ ${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \
includes MK_INCLUDES=yes includes
.if !empty(SUBDIR_OVERRIDE) && make(buildworld) .if !empty(SUBDIR_OVERRIDE) && make(buildworld)
${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes ${_+_}cd ${.CURDIR}; ${WMAKE} MK_INCLUDES=yes SHARED=symlinks includes
.endif .endif
_libraries: _libraries:
@echo @echo