Skip to content

Commit 413b35c

Browse files
committed
[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
1 parent 66f1c6f commit 413b35c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

llvm/utils/release/test-release.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,8 @@ function test_llvmCore() {
452452
if [ $do_test_suite = 'yes' ]; then
453453
cd $TestSuiteBuildDir
454454
env CC="$c_compiler" CXX="$cxx_compiler" \
455-
cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit
455+
cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit \
456+
-DTEST_SUITE_HOST_CC=$build_compiler
456457

457458
if ! ( ${MAKE} -j $NumJobs $KeepGoing check \
458459
2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
@@ -548,6 +549,8 @@ for Flavor in $Flavors ; do
548549

549550
c_compiler="$CC"
550551
cxx_compiler="$CXX"
552+
build_compiler="$CC"
553+
[[ -z "$build_compiler" ]] && build_compiler="cc"
551554
llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.obj
552555
llvmCore_phase1_destdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.install
553556

0 commit comments

Comments
 (0)