Skip to content

Commit df2fcea

Browse files
committed
Revert "Revert "Revert "[release] Use the Bootstrapping build for building LLVM releases"""
This reverts commit a9415df. There are still bugs reported with the new bootstraping build. See https://reviews.llvm.org/D121276#3375464
1 parent 893b864 commit df2fcea

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

llvm/utils/release/test-release.sh

+4-8
Original file line numberDiff line numberDiff line change
@@ -244,17 +244,16 @@ projects="llvm clang"
244244
if [ $do_clang_tools = "yes" ]; then
245245
projects="$projects clang-tools-extra"
246246
fi
247-
runtimes=""
248247
if [ $do_rt = "yes" ]; then
249-
runtimes="$runtimes compiler-rt"
248+
projects="$projects compiler-rt"
250249
fi
251250
if [ $do_libs = "yes" ]; then
252-
runtimes="$runtimes libcxx"
251+
projects="$projects libcxx"
253252
if [ $do_libcxxabi = "yes" ]; then
254-
runtimes="$runtimes libcxxabi"
253+
projects="$projects libcxxabi"
255254
fi
256255
if [ $do_libunwind = "yes" ]; then
257-
runtimes="$runtimes libunwind"
256+
projects="$projects libunwind"
258257
fi
259258
fi
260259
if [ $do_openmp = "yes" ]; then
@@ -381,7 +380,6 @@ function configure_llvmCore() {
381380
esac
382381

383382
project_list=${projects// /;}
384-
runtime_list=${runtimes// /;}
385383
echo "# Using C compiler: $c_compiler"
386384
echo "# Using C++ compiler: $cxx_compiler"
387385

@@ -394,7 +392,6 @@ function configure_llvmCore() {
394392
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
395393
-DLLVM_ENABLE_PROJECTS="$project_list" \
396394
-DLLVM_LIT_ARGS="-j $NumJobs" \
397-
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
398395
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
399396
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
400397
env CC="$c_compiler" CXX="$cxx_compiler" \
@@ -403,7 +400,6 @@ function configure_llvmCore() {
403400
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
404401
-DLLVM_ENABLE_PROJECTS="$project_list" \
405402
-DLLVM_LIT_ARGS="-j $NumJobs" \
406-
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
407403
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
408404
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
409405

0 commit comments

Comments
 (0)