diff options
| author | Tom Stellard <tstellar@redhat.com> | 2022-03-10 12:51:05 -0800 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-03-10 12:51:05 -0800 |
| commit | a9415df334f09c1bea51ce2be1684b4391eac245 (patch) | |
| tree | 7b4ca517ee15dd9fd6c54302f79f391e7c69f1e9 | |
| parent | e54a7bf0c0f14115ec3bd7738850ee83f8428319 (diff) | |
Revert "Revert "[release] Use the Bootstrapping build for building LLVM releases""
This reverts commit eb84577cbc23d44735f10bca9dbd2151aba96a60.
The issues with check-all were fixed in e54a7bf0c0f14115ec3bd7738850ee83f8428319,
so we can re-enable bootstrap build for test-release.sh.
| -rwxr-xr-x | llvm/utils/release/test-release.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh index e27e85793537..009f9358145f 100755 --- a/llvm/utils/release/test-release.sh +++ b/llvm/utils/release/test-release.sh @@ -244,16 +244,17 @@ projects="llvm clang" if [ $do_clang_tools = "yes" ]; then projects="$projects clang-tools-extra" fi +runtimes="" if [ $do_rt = "yes" ]; then - projects="$projects compiler-rt" + runtimes="$runtimes compiler-rt" fi if [ $do_libs = "yes" ]; then - projects="$projects libcxx" + runtimes="$runtimes libcxx" if [ $do_libcxxabi = "yes" ]; then - projects="$projects libcxxabi" + runtimes="$runtimes libcxxabi" fi if [ $do_libunwind = "yes" ]; then - projects="$projects libunwind" + runtimes="$runtimes libunwind" fi fi if [ $do_openmp = "yes" ]; then @@ -380,6 +381,7 @@ function configure_llvmCore() { esac project_list=${projects// /;} + runtime_list=${runtimes// /;} echo "# Using C compiler: $c_compiler" echo "# Using C++ compiler: $cxx_compiler" @@ -392,6 +394,7 @@ function configure_llvmCore() { -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DLLVM_ENABLE_PROJECTS="$project_list" \ -DLLVM_LIT_ARGS="-j $NumJobs" \ + -DLLVM_ENABLE_RUNTIMES="$runtime_list" \ $ExtraConfigureFlags $BuildDir/llvm-project/llvm \ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log env CC="$c_compiler" CXX="$cxx_compiler" \ @@ -400,6 +403,7 @@ function configure_llvmCore() { -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DLLVM_ENABLE_PROJECTS="$project_list" \ -DLLVM_LIT_ARGS="-j $NumJobs" \ + -DLLVM_ENABLE_RUNTIMES="$runtime_list" \ $ExtraConfigureFlags $BuildDir/llvm-project/llvm \ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log |