]> xenbits.xensource.com Git - people/julieng/freebsd.git/commit
Fix wrong PATH being set for world 'includes' stage after r289438.
authorbdrewery <bdrewery@FreeBSD.org>
Sat, 17 Oct 2015 18:22:18 +0000 (18:22 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Sat, 17 Oct 2015 18:22:18 +0000 (18:22 +0000)
commitc55ea073397f5dc06529bc3581b9dae9c0690139
tree8ff92e029286faeea6848a9a9283f32f4bf7577a
parent45d403ed233a66523203dfdc9aa62f85efc13787
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
Makefile.inc1