svn commit: r289462 - head

[Bryan Drewery]

Author: bdrewery
Date: Sat Oct 17 18:22:18 2015
New Revision: 289462
URL: https://svnweb.freebsd.org/changeset/base/289462

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Oct 17 17:26:44 2015	(r289461)
+++ head/Makefile.inc1	Sat Oct 17 18:22:18 2015	(r289462)
@@ -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: