aboutsummaryrefslogtreecommitdiff
path: root/targets/pseudo
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2015-11-30 22:53:55 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2015-11-30 22:53:55 +0000
commitdfb62a5a22274572fae7840bde02852cd0645680 (patch)
tree44c3289749f6fa94a3e6b2cd3b17119d033e005f /targets/pseudo
parente58834bc294262ba82caaa538ddc219e8a11e740 (diff)
downloadsrc-dfb62a5a22274572fae7840bde02852cd0645680.tar.gz
src-dfb62a5a22274572fae7840bde02852cd0645680.zip
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
Notes
Notes: svn path=/head/; revision=291540
Diffstat (limited to 'targets/pseudo')
-rw-r--r--targets/pseudo/bootstrap-tools/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index f196c8a7322f..8b4c7629698f 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -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