[llvm-branch-commits] [llvm] eb84577 - Revert "[release] Use the Bootstrapping build for building LLVM releases"

[Tom Stellard via llvm-branch-commits]

Author: Louis Dionne
Date: 2022-03-08T20:35:54-08:00
New Revision: eb84577cbc23d44735f10bca9dbd2151aba96a60

URL: https://github.com/llvm/llvm-project/commit/eb84577cbc23d44735f10bca9dbd2151aba96a60
DIFF: https://github.com/llvm/llvm-project/commit/eb84577cbc23d44735f10bca9dbd2151aba96a60.diff

LOG: Revert "[release] Use the Bootstrapping build for building LLVM releases"

This reverts commit c8bb1777fff5d1ae28a2deac0d6677e081d4200f to fix
https://github.com/llvm/llvm-project/issues/54154 on the release branch.

Differential Revision: https://reviews.llvm.org/D121258

Added: 
    

Modified: 
    llvm/utils/release/test-release.sh

Removed: 
    


################################################################################
diff  --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh
index 009f9358145f3..e27e857935376 100755
--- a/llvm/utils/release/test-release.sh
+++ b/llvm/utils/release/test-release.sh
@@ -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
@@ -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"
 
@@ -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" \
@@ -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