From 413b35cd74e42f6371641bc9dc6c707aedac82ff Mon Sep 17 00:00:00 2001 From: Amy Kwan Date: Thu, 3 Feb 2022 21:31:44 -0600 Subject: [PATCH] [test-release.sh] Set TEST_SUITE_HOST_CC to the release testing build compiler when compiling test-suite tools. The tools used by test-suite are originally configured to compile with cc by default, and this is dictated by TEST_SUITE_HOST_CC. However, it is possible that on some systems that the version of cc may either not be present or it may not be able to compile the tools as it may be too old, which could be an issue seen during release testing. This patch updates the compiler to be the default build compiler that is used for release testing. If no such compiler it specified, then cc will be set as the test-suite tools build compiler by default (as it already is set under TEST_SUITE_HOST_CC). Differential Revision: https://reviews.llvm.org/D118357 --- llvm/utils/release/test-release.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh index d6fb5a9..bb8aeda 100755 --- a/llvm/utils/release/test-release.sh +++ b/llvm/utils/release/test-release.sh @@ -452,7 +452,8 @@ function test_llvmCore() { if [ $do_test_suite = 'yes' ]; then cd $TestSuiteBuildDir env CC="$c_compiler" CXX="$cxx_compiler" \ - cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit + cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit \ + -DTEST_SUITE_HOST_CC=$build_compiler if ! ( ${MAKE} -j $NumJobs $KeepGoing check \ 2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then @@ -548,6 +549,8 @@ for Flavor in $Flavors ; do c_compiler="$CC" cxx_compiler="$CXX" + build_compiler="$CC" + [[ -z "$build_compiler" ]] && build_compiler="cc" llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.obj llvmCore_phase1_destdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.install -- 2.7.4