diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-11-30 22:53:55 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-11-30 22:53:55 +0000 |
| commit | 06c0929b91cd4121b8acee98dcf1245a3e5ba248 (patch) | |
| tree | 44c3289749f6fa94a3e6b2cd3b17119d033e005f | |
| parent | 22ee9c29c9b006b884e494c184ac408fc4fd4589 (diff) | |
| download | FreeBSD-src-06c0929b91cd4121b8acee98dcf1245a3e5ba248.zip FreeBSD-src-06c0929b91cd4121b8acee98dcf1245a3e5ba248.tar.gz | |
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
| -rw-r--r-- | targets/pseudo/bootstrap-tools/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index f196c8a..8b4c762 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 |
