Skip to content

Commit c8bb177

Browse files
committed
[release] Use the Bootstrapping build for building LLVM releases
Instead of using the (now deprecated) Projects build for libcxx, libcxxabi, libunwind and compiler-rt, this patch uses the Bootstrapping build. This implies that Clang will be built from scratch, and then the runtimes will be built using that just-built Clang instead of the system compiler. This is the correct way of assembling a toolchain, since we don't want to ship runtimes that were built with a non-Clang compiler (or a potentially older Clang). Differential Revision: https://reviews.llvm.org/D112748 (cherry picked from commit 26a1830)
1 parent 91632c8 commit c8bb177

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

llvm/utils/release/test-release.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,17 @@ fi
236236

237237
# Projects list
238238
projects="llvm clang clang-tools-extra"
239+
runtimes=""
239240
if [ $do_rt = "yes" ]; then
240-
projects="$projects compiler-rt"
241+
runtimes="$runtimes compiler-rt"
241242
fi
242243
if [ $do_libs = "yes" ]; then
243-
projects="$projects libcxx"
244+
runtimes="$runtimes libcxx"
244245
if [ $do_libcxxabi = "yes" ]; then
245-
projects="$projects libcxxabi"
246+
runtimes="$runtimes libcxxabi"
246247
fi
247248
if [ $do_libunwind = "yes" ]; then
248-
projects="$projects libunwind"
249+
runtimes="$runtimes libunwind"
249250
fi
250251
fi
251252
case $do_test_suite in
@@ -377,6 +378,7 @@ function configure_llvmCore() {
377378
esac
378379

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

@@ -389,6 +391,7 @@ function configure_llvmCore() {
389391
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
390392
-DLLVM_ENABLE_PROJECTS="$project_list" \
391393
-DLLVM_LIT_ARGS="-j $NumJobs" \
394+
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
392395
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
393396
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
394397
env CC="$c_compiler" CXX="$cxx_compiler" \
@@ -397,6 +400,7 @@ function configure_llvmCore() {
397400
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
398401
-DLLVM_ENABLE_PROJECTS="$project_list" \
399402
-DLLVM_LIT_ARGS="-j $NumJobs" \
403+
-DLLVM_ENABLE_RUNTIMES="$runtime_list" \
400404
$ExtraConfigureFlags $BuildDir/llvm-project/llvm \
401405
2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
402406

0 commit comments

Comments
 (0)