svn commit: r291540 - head/targets/pseudo/bootstrap-tools

[Bryan Drewery]

Author: bdrewery
Date: Mon Nov 30 22:53:55 2015
New Revision: 291540
URL: https://svnweb.freebsd.org/changeset/base/291540

Log:
  META MODE: Fix bootstrap-tools after r291349.
  
  Now that OBJTOP is assumed to be proper, it needs to be overridden for
  the bootstrap-tools phase to ensure it is not kept as the top-level
  OBJTOP.  Otherwise the libraries were not found during the
  bootstrap-tools phase.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/targets/pseudo/bootstrap-tools/Makefile

Modified: head/targets/pseudo/bootstrap-tools/Makefile
==============================================================================
--- head/targets/pseudo/bootstrap-tools/Makefile	Mon Nov 30 22:53:41 2015	(r291539)
+++ head/targets/pseudo/bootstrap-tools/Makefile	Mon Nov 30 22:53:55 2015	(r291540)
@@ -43,6 +43,9 @@ BSARGS= 	DESTDIR= \
 		MK_LLDB=no MK_TESTS=no \
 		MK_INCLUDES=yes
 
+# Need to override these so OBJTOP uses are proper in the non-meta build.
+BSARGS+= OBJTOP=${BTOOLSDIR}${SRCTOP} OBJROOT='$${OBJTOP}/'
+
 DISTRIB_ENV=	INSTALL="sh ${SRCTOP}/tools/install.sh" NO_FSCHG=1 MK_TESTS=no
 legacy: .MAKE .META
 	mkdir -p ${LEGACY_TOOLS}
@@ -72,11 +75,11 @@ BSTCENV= \
 	TARGET_ARCH=${HOST_MACHINE_ARCH}
 
 BSTCARGS= \
-	${BSARGS} \
+	${BSARGS:NDESTDIR=*:NOBJTOP=*:NOBJROOT=*} \
 	BUILD_DIRDEPS=yes \
 	-DWITH_STAGING \
 	-DWITH_TOOLSDIR
 
 # finally we build toolchain leveraging the above.
 bootstrap-toolchain:	.MAKE cross-tools
-	${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS:NDESTDIR=} toolchain
+	${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS} toolchain