Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Mar 2016 22:36:32 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r297281 - head
Message-ID:  <201603252236.u2PMaW44025525@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Fri Mar 25 22:36:32 2016
New Revision: 297281
URL: https://svnweb.freebsd.org/changeset/base/297281

Log:
  WITHOUT_TOOLCHAIN: Fix includes not being staged in WORLDTMP.
  
  This has been the case since r264930 and r274662.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Mar 25 22:36:29 2016	(r297280)
+++ head/Makefile.inc1	Fri Mar 25 22:36:32 2016	(r297281)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603252236.u2PMaW44025525>