aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2018-06-28 18:22:20 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2018-06-28 18:22:20 +0000
commitb38b45af2faa0f3736ed53097e6e6b52e387afdf (patch)
treeebb9da4e26ad8a35d0750b45831bf4760ef844a3 /Makefile
parent32cec12c7573e03e79b877af65aee197818b5d02 (diff)
downloadsrc-b38b45af2faa0f3736ed53097e6e6b52e387afdf.tar.gz
src-b38b45af2faa0f3736ed53097e6e6b52e387afdf.zip
tinderbox: If the clang lookup fails fallback to the old default behavior.
This fixes errors from the MK_CLANG_BOOTSTRAP/MK_LLD_BOOTSTRAP lookups to not force using XCC/XLD but to rather just build them as normal by allowing their own bootstrap logic to work. MFC after: 3 weeks X-MFC-with: r335711 r335769 Sponsored by: Dell EMC
Notes
Notes: svn path=/head/; revision=335770
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 0e2f94e0cda3..0d62c09a29a0 100644
--- a/Makefile
+++ b/Makefile
@@ -587,19 +587,21 @@ universe_${target}_worlds: .PHONY
_need_clang_${target}_${target_arch} != \
env TARGET=${target} TARGET_ARCH=${target_arch} \
${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-compiler \
- ${MAKE_PARAMS_${target}} -V MK_CLANG_BOOTSTRAP
+ ${MAKE_PARAMS_${target}} -V MK_CLANG_BOOTSTRAP 2>/dev/null || \
+ echo unknown
.export _need_clang_${target}_${target_arch}
.endif
.if !defined(_need_lld_${target}_${target_arch})
_need_lld_${target}_${target_arch} != \
env TARGET=${target} TARGET_ARCH=${target_arch} \
${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-linker \
- ${MAKE_PARAMS_${target}} -V MK_LLD_BOOTSTRAP
+ ${MAKE_PARAMS_${target}} -V MK_LLD_BOOTSTRAP 2>/dev/null || \
+ echo unknown
.export _need_lld_${target}_${target_arch}
.endif
# Setup env for each arch to use the one clang.
.if defined(_need_clang_${target}_${target_arch}) && \
- ${_need_clang_${target}_${target_arch}} != "no"
+ ${_need_clang_${target}_${target_arch}} == "yes"
# No check on existing XCC or CROSS_BINUTILS_PREFIX, etc, is needed since
# we use the test-system-compiler logic to determine if clang needs to be
# built. It will be no from that logic if already using an external
@@ -613,7 +615,7 @@ MAKE_PARAMS_${target}+= \
XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp"
.endif
.if defined(_need_lld_${target}_${target_arch}) && \
- ${_need_lld_${target}_${target_arch}} != "no"
+ ${_need_lld_${target}_${target_arch}} == "yes"
MAKE_PARAMS_${target}+= \
XLD="${HOST_OBJTOP}/tmp/usr/bin/ld"
.endif
@@ -625,9 +627,9 @@ universe_${target}_done: universe_${target}_worlds .PHONY
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}_worlds: universe_${target}_${target_arch} .PHONY
.if (defined(_need_clang_${target}_${target_arch}) && \
- ${_need_clang_${target}_${target_arch}} != "no") || \
+ ${_need_clang_${target}_${target_arch}} == "yes") || \
(defined(_need_lld_${target}_${target_arch}) && \
- ${_need_lld_${target}_${target_arch}} != "no")
+ ${_need_lld_${target}_${target_arch}} == "yes")
universe_${target}_${target_arch}: universe-toolchain
universe_${target}_prologue: universe-toolchain
.endif