diff --git a/test/jenkins/test_build.py b/test/jenkins/test_build.py index cbb7cec7e..07e4bf01e 100644 --- a/test/jenkins/test_build.py +++ b/test/jenkins/test_build.py @@ -20,7 +20,8 @@ # CHECK-SIMPLE: '/usr/local/bin/cmake' '-G' 'Ninja' '-C' # CHECK-SIMPLE: '-DLLVM_ENABLE_ASSERTIONS:BOOL=FALSE' # CHECK-SIMPLE: '-DCMAKE_BUILD_TYPE=RelWithDebInfo' -# CHECK-SIMPLE: '-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;compiler-rt' +# CHECK-SIMPLE: '-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra' +# CHECK-SIMPLE: '-DLLVM_ENABLE_RUNTIMES=compiler-rt' # CHECK-SIMPLE: '-DCMAKE_MAKE_PROGRAM=/usr/local/bin/ninja' # CHECK-SIMPLE: '-DLLVM_VERSION_PATCH=99' # CHECK-SIMPLE: '-DLLVM_VERSION_SUFFIX=""' diff --git a/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh b/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh index fdbdd3afc..b556232dd 100755 --- a/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh @@ -25,7 +25,8 @@ readonly STAGE2_DIR=llvm_build2_host cmake \ ${CMAKE_COMMON_OPTIONS} \ - -DLLVM_ENABLE_PROJECTS="clang;compiler-rt;lld" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ + -DLLVM_ENABLE_RUNTIMES="compiler-rt" \ -DCMAKE_C_COMPILER=${COMPILER_BIN_DIR}/clang \ -DCMAKE_CXX_COMPILER=${COMPILER_BIN_DIR}/clang++ \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ @@ -256,7 +257,8 @@ function configure_hwasan_lam { # STAGE1_DIR is build once, so we can use CCACHE. cmake \ ${CMAKE_COMMON_OPTIONS} \ - -DLLVM_ENABLE_PROJECTS="clang;compiler-rt;lld" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ + -DLLVM_ENABLE_RUNTIMES="compiler-rt" \ -DCMAKE_C_COMPILER="${COMPILER_BIN_DIR}/clang" \ -DCMAKE_CXX_COMPILER="${COMPILER_BIN_DIR}/clang++" \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ diff --git a/zorg/jenkins/build.py b/zorg/jenkins/build.py index 783d9cb29..3da640454 100644 --- a/zorg/jenkins/build.py +++ b/zorg/jenkins/build.py @@ -1076,10 +1076,10 @@ def parse_args(): action='store_true', help="Turn on the experimental" " GlobalISel CMake flag.") parser.add_argument('--projects', dest='llvm_enable_projects', - default="clang;clang-tools-extra;compiler-rt", + default="clang;clang-tools-extra", help="Semicolon seperated list of projects to enable.") parser.add_argument('--runtimes', dest='llvm_enable_runtimes', - default="", + default="compiler-rt", help="Semicolon seperated list of runtimes to enable.") parser.add_argument('--timeout', dest='timeout', type=int, default='600', help='Individual test timeout in seconds.') diff --git a/zorg/jenkins/jobs/jobs/clang-san-iossim b/zorg/jenkins/jobs/jobs/clang-san-iossim index ab08aedce..7c0957079 100644 --- a/zorg/jenkins/jobs/jobs/clang-san-iossim +++ b/zorg/jenkins/jobs/jobs/clang-san-iossim @@ -65,7 +65,8 @@ pipeline { python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \ --assertions --cmake-type=RelWithDebInfo \ - --projects="clang;clang-tools-extra;compiler-rt" + --projects="clang;clang-tools-extra" \ + --runtimes="compiler-rt" ''' } } @@ -75,7 +76,7 @@ pipeline { environment { PATH="$PATH:/usr/bin:/usr/local/bin" SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER='iPhone 15' - COMPILER_RT_TEST_DIR="${WORKSPACE}/clang-build/tools/clang/runtime/compiler-rt-bins/test" + COMPILER_RT_TEST_DIR="${WORKSPACE}/clang-build/runtimes/runtimes-bins/compiler-rt/test" } steps { timeout(90) { diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-RA b/zorg/jenkins/jobs/jobs/clang-stage1-RA index 3e76b25c3..547f5ed26 100644 --- a/zorg/jenkins/jobs/jobs/clang-stage1-RA +++ b/zorg/jenkins/jobs/jobs/clang-stage1-RA @@ -91,7 +91,8 @@ pipeline { rm -rf clang-build clang-install *.tar.gz python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \ --assertions --cmake-type=RelWithDebInfo \ - --projects="clang;clang-tools-extra;compiler-rt" \ + --projects="clang;clang-tools-extra" \ + --runtimes="compiler-rt" \ --cmake-flag="-DPython3_EXECUTABLE=$(which python)" ''' } diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-RA-as b/zorg/jenkins/jobs/jobs/clang-stage1-RA-as index 169ab41bd..445cbae44 100644 --- a/zorg/jenkins/jobs/jobs/clang-stage1-RA-as +++ b/zorg/jenkins/jobs/jobs/clang-stage1-RA-as @@ -89,7 +89,8 @@ pipeline { rm -rf clang-build clang-install *.tar.gz python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \ --assertions --cmake-type=RelWithDebInfo \ - --projects="clang;clang-tools-extra;compiler-rt" \ + --projects="clang;clang-tools-extra" \ + --runtimes="compiler-rt" \ --cmake-flag="-DPython3_EXECUTABLE=$(which python)" \ --cmake-flag="-DLLVM_TARGETS_TO_BUILD=AArch64" ''' diff --git a/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto b/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto index d1bba10f8..7547f4ba6 100644 --- a/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto +++ b/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto @@ -101,7 +101,7 @@ pipeline { echo "ARTIFACT=$JOB_NAME/clang-d$GIT_DISTANCE-g$GIT_SHA-t$BUILD_ID-b$BUILD_NUMBER.tar.gz" > build.properties python llvm-zorg/zorg/jenkins/monorepo_build.py clang build \ - --thinlto --projects="clang;compiler-rt" \ + --thinlto --projects="clang" --runtimes="compiler-rt" \ --cmake-flag="-DCMAKE_DSYMUTIL=$WORKSPACE/host-compiler/bin/dsymutil" \ --runtimes="libunwind" \ --cmake-flag="-DPython3_EXECUTABLE=$(which python)" diff --git a/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgTSan b/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgTSan index 56211a8cf..86ebd1042 100644 --- a/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgTSan +++ b/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgTSan @@ -97,8 +97,8 @@ pipeline { python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \ --cmake-type=RelWithDebInfo \ - --projects="clang;clang-tools-extra;compiler-rt" \ - --runtimes="libcxx;libcxxabi" \ + --projects="clang;clang-tools-extra" \ + --runtimes="libcxx;libcxxabi;compiler-rt" \ --cmake-flag='-DLLVM_USE_SANITIZER=Thread' \ --cmake-flag='-DLLVM_ENABLE_LTO=Thin' \ --cmake-flag='-DLLVM_BUILD_RUNTIME=OFF' \