Skip to content

Commit a9415df

Browse files
committed
Revert "Revert "[release] Use the Bootstrapping build for building LLVM releases""
This reverts commit eb84577. The issues with check-all were fixed in e54a7bf, so we can re-enable bootstrap build for test-release.sh.
1 parent e54a7bf commit a9415df

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

llvm/utils/release/test-release.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,17 @@ projects="llvm clang"
244244
if [ $do_clang_tools = "yes" ]; then
245245
projects="$projects clang-tools-extra"
246246
fi
247+
runtimes=""
247248
if [ $do_rt = "yes" ]; then
248-
projects="$projects compiler-rt"
249+
runtimes="$runtimes compiler-rt"
249250
fi
250251
if [ $do_libs = "yes" ]; then
251-
projects="$projects libcxx"
252+
runtimes="$runtimes libcxx"
252253
if [ $do_libcxxabi = "yes" ]; then
253-
projects="$projects libcxxabi"
254+
runtimes="$runtimes libcxxabi"
254255
fi
255256
if [ $do_libunwind = "yes" ]; then
256-
projects="$projects libunwind"
257+
runtimes="$runtimes libunwind"
257258
fi
258259
fi
259260
if [ $do_openmp = "yes" ]; then
@@ -380,6 +381,7 @@ function configure_llvmCore() {
380381
esac
381382

382383
project_list=${projects// /;}
384+
runtime_list=${runtimes// /;}
383385
echo "# Using C compiler: $c_compiler"
384386
echo "# Using C++ compiler: $cxx_compiler"
385387

@@ -392,6 +394,7 @@ function configure_llvmCore() {
392394
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
393395
-DLLVM_ENABLE_PROJECTS="$project_list" \
394396
-DLLVM_LIT_ARGS="-j $NumJobs" \
397+
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
395398
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
396399
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
397400
env CC="$c_compiler" CXX="$cxx_compiler" \
@@ -400,6 +403,7 @@ function configure_llvmCore() {
400403
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
401404
-DLLVM_ENABLE_PROJECTS="$project_list" \
402405
-DLLVM_LIT_ARGS="-j $NumJobs" \
406+
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
403407
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
404408
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
405409

0 commit comments

Comments
 (0)