Skip to content

Commit

Permalink
Revert "[release] Use the Bootstrapping build for building LLVM relea…
Browse files Browse the repository at this point in the history
…ses"

This reverts commit c8bb177 to fix
#54154 on the release branch.

Differential Revision: https://reviews.llvm.org/D121258
  • Loading branch information
ldionne authored and tstellar committed Mar 9, 2022
1 parent d843bde commit eb84577
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions llvm/utils/release/test-release.sh
Expand Up @@ -244,17 +244,16 @@ projects="llvm clang"
if [ $do_clang_tools = "yes" ]; then
projects="$projects clang-tools-extra"
fi
runtimes=""
if [ $do_rt = "yes" ]; then
runtimes="$runtimes compiler-rt"
projects="$projects compiler-rt"
fi
if [ $do_libs = "yes" ]; then
runtimes="$runtimes libcxx"
projects="$projects libcxx"
if [ $do_libcxxabi = "yes" ]; then
runtimes="$runtimes libcxxabi"
projects="$projects libcxxabi"
fi
if [ $do_libunwind = "yes" ]; then
runtimes="$runtimes libunwind"
projects="$projects libunwind"
fi
fi
if [ $do_openmp = "yes" ]; then
Expand Down Expand Up @@ -381,7 +380,6 @@ function configure_llvmCore() {
esac

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

Expand All @@ -394,7 +392,6 @@ 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" \
Expand All @@ -403,7 +400,6 @@ 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

Expand Down

0 comments on commit eb84577

Please sign in to comment.