diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-06-27 16:58:10 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-06-27 16:58:10 +0000 |
| commit | 01f124b46fb9b0f02d8cc9600f81d9a6d13a74fc (patch) | |
| tree | b9469c8d680d26d4420e5873820ec3738061fccc /Makefile.inc1 | |
| parent | 90eb413a336ee0c6a8498435d43d2c0e2ee2fbe5 (diff) | |
| download | src-test-01f124b46fb9b0f02d8cc9600f81d9a6d13a74fc.tar.gz src-test-01f124b46fb9b0f02d8cc9600f81d9a6d13a74fc.zip | |
tinderbox: Only build clang/lld once if needed.
Need to handle LLD_BOOTSTRAP separately (for archs like i386).
This would be much better off with an off-by-default option like
SHARED_TOOLCHAIN that universe force-enabled. Then a normal buildworld
would store the toolchain there if enabled and otherwise in WORLDTMP
with only the 1 arch selected.
MFC after: 3 weeks
Sponsored by: Dell EMC
Notes
Notes:
svn path=/head/; revision=335711
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 0c693ae0d5b7e..613e2d969c25d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -645,7 +645,7 @@ CROSSENV+= ${TARGET_CFLAGS} # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ - TOOLS_PREFIX=${WORLDTMP} \ + TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" @@ -694,7 +694,8 @@ XMAKE+= MK_LLVM_TARGET_ALL=no KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} -KTMAKE= TOOLS_PREFIX=${WORLDTMP} \ +KTMAKE= \ + TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \ ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ DESTDIR= \ OBJTOP='${WORLDTMP}/obj-kernel-tools' \ |