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
This commit is contained in:
parent
e58834bc29
commit
dfb62a5a22
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=291540
@ -43,6 +43,9 @@ BSARGS= DESTDIR= \
|
|||||||
MK_LLDB=no MK_TESTS=no \
|
MK_LLDB=no MK_TESTS=no \
|
||||||
MK_INCLUDES=yes
|
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
|
DISTRIB_ENV= INSTALL="sh ${SRCTOP}/tools/install.sh" NO_FSCHG=1 MK_TESTS=no
|
||||||
legacy: .MAKE .META
|
legacy: .MAKE .META
|
||||||
mkdir -p ${LEGACY_TOOLS}
|
mkdir -p ${LEGACY_TOOLS}
|
||||||
@ -72,11 +75,11 @@ BSTCENV= \
|
|||||||
TARGET_ARCH=${HOST_MACHINE_ARCH}
|
TARGET_ARCH=${HOST_MACHINE_ARCH}
|
||||||
|
|
||||||
BSTCARGS= \
|
BSTCARGS= \
|
||||||
${BSARGS} \
|
${BSARGS:NDESTDIR=*:NOBJTOP=*:NOBJROOT=*} \
|
||||||
BUILD_DIRDEPS=yes \
|
BUILD_DIRDEPS=yes \
|
||||||
-DWITH_STAGING \
|
-DWITH_STAGING \
|
||||||
-DWITH_TOOLSDIR
|
-DWITH_TOOLSDIR
|
||||||
|
|
||||||
# finally we build toolchain leveraging the above.
|
# finally we build toolchain leveraging the above.
|
||||||
bootstrap-toolchain: .MAKE cross-tools
|
bootstrap-toolchain: .MAKE cross-tools
|
||||||
${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS:NDESTDIR=} toolchain
|
${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS} toolchain
|
||||||
|
Loading…
Reference in New Issue
Block a user