diff --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh --- a/llvm/utils/release/test-release.sh +++ b/llvm/utils/release/test-release.sh @@ -22,6 +22,7 @@ Release="" Release_no_dot="" RC="" +Runtimes="" Triple="" use_gzip="no" do_checkout="yes" @@ -49,6 +50,7 @@ echo "" echo " -release X.Y.Z The release version to test." echo " -rc NUM The pre-release candidate number." + echo " -runtimes PROJECTS Projects to be built as apart of runtimes (semicolon separated list)." echo " -final The final release candidate." echo " -triple TRIPLE The target triple for this machine." echo " -j NUM Number of compile jobs to run. [default: 3]" @@ -86,6 +88,10 @@ shift RC="rc$1" ;; + -runtimes | --runtimes ) + shift + Runtimes="$1" + ;; -final | --final ) RC=final ;; @@ -236,15 +242,15 @@ # Projects list projects="llvm clang clang-tools-extra" -if [ $do_rt = "yes" ]; then +if [ $do_rt = "yes" ] && [[ $Runtimes != *"compiler-rt"* ]]; then projects="$projects compiler-rt" fi -if [ $do_libs = "yes" ]; then +if [ $do_libs = "yes" ] && [[ $Runtimes != *"libcxx"* ]]; then projects="$projects libcxx" - if [ $do_libcxxabi = "yes" ]; then + if [ $do_libcxxabi = "yes" ] && [[ $Runtimes != *"libcxxabi"* ]]; then projects="$projects libcxxabi" fi - if [ $do_libunwind = "yes" ]; then + if [ $do_libunwind = "yes" ] && [[ $Runtimes != *"libunwind"* ]]; then projects="$projects libunwind" fi fi @@ -387,12 +393,14 @@ cmake -G "$generator" \ -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \ -DLLVM_ENABLE_PROJECTS="$project_list" \ + -DLLVM_ENABLE_RUNTIMES="$Runtimes" \ $ExtraConfigureFlags $BuildDir/llvm-project/llvm \ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log env CC="$c_compiler" CXX="$cxx_compiler" \ cmake -G "$generator" \ -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \ -DLLVM_ENABLE_PROJECTS="$project_list" \ + -DLLVM_ENABLE_RUNTIMES="$Runtimes" \ $ExtraConfigureFlags $BuildDir/llvm-project/llvm \ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log