diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-17 18:22:18 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-17 18:22:18 +0000 |
| commit | c55ea073397f5dc06529bc3581b9dae9c0690139 (patch) | |
| tree | 8ff92e029286faeea6848a9a9283f32f4bf7577a /Makefile.inc1 | |
| parent | 45d403ed233a66523203dfdc9aa62f85efc13787 (diff) | |
| download | FreeBSD-src-c55ea073397f5dc06529bc3581b9dae9c0690139.zip FreeBSD-src-c55ea073397f5dc06529bc3581b9dae9c0690139.tar.gz | |
Fix wrong PATH being set for world 'includes' stage after r289438.
The 'includes' target is currently a pseudo target in bsd.subdir.mk that
does 'cd ${.CURDIR} && ${MAKE} buildincludes && ${MAKE} installincludes',
versus all over targets that just recurse.
In Makefile.inc1 the older duplicated bsd.subdir.mk logic for calling
'includes' was being executed in each subdir directly, meaning 'cd lib && make
includes' became 'cd lib && make buildincludes && make installincludes'. Now
that the bsd.subdir.mk logic is used it is calling 'make buildincludes && make
installincludes' from the top-level which pulls in the PATH=<default path>
from /Makefile.
The sub-make logic for 'includes' in bsd.subdir.mk was attempted to be removed
in r289282 but turned out to be wrong. I have a working version now but
it is not yet ready for commit. So for now in Makefile.inc1 split out
'includes' to 'buildincludes' and 'installincludes' which will avoid the
problem.
MFC after: 2 weeks
X-MFC-With: r289438
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c0ef145..44b1171 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -624,7 +624,8 @@ _includes: @echo "--------------------------------------------------------------" @echo ">>> stage 4.1: building includes" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes + ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks buildincludes + ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks installincludes _libraries: @echo @echo "--------------------------------------------------------------" @@ -2268,7 +2269,9 @@ _xi-cross-tools: .endfor _xi-includes: - ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 includes \ + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 buildincludes \ + DESTDIR=${XDDESTDIR} + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 installincludes \ DESTDIR=${XDDESTDIR} _xi-libraries: |
