Build fewer architectures on specialized LLDB builders
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
index c9ff6f0..36d5116 100644
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
@@ -51,7 +51,7 @@
export PATH=$PATH:/usr/bin:/usr/local/bin
- python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake build \
+ python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix build \
--assertions \
--projects="clang;libcxx;libcxxabi;lldb" \
--cmake-type=Release \
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-standalone b/zorg/jenkins/jobs/jobs/lldb-cmake-standalone
index f2b7b02..b10d9fe 100644
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-standalone
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-standalone
@@ -56,6 +56,7 @@
--projects="clang;libcxx;libcxxabi" \
--cmake-flag="-DLLVM_INSTALL_UTILS=On" \
--cmake-flag="-DLLVM_INSTALL_TOOLCHAIN_ONLY=Off"
+ --cmake-flag="-DLLVM_TARGETS_TO_BUILD=X86"
'''
}
}
diff --git a/zorg/jenkins/monorepo_build.py b/zorg/jenkins/monorepo_build.py
index a2146de..80973e2 100644
--- a/zorg/jenkins/monorepo_build.py
+++ b/zorg/jenkins/monorepo_build.py
@@ -534,11 +534,11 @@
'-DLLVM_VERSION_PATCH=99']
+ if variant in 'sanitized', 'matrix':
+ cmake_cmd.append('-DLLVM_TARGETS_TO_BUILD=X86')
+
if variant == 'sanitized':
- cmake_cmd.extend([
- '-DLLVM_TARGETS_TO_BUILD=X86',
- '-DLLVM_USE_SANITIZER=Address;Undefined'
- ])
+ cmake_cmd.append('-DLLVM_USE_SANITIZER=Address;Undefined')
# There is no need to compile the lldb tests with an asanified compiler
# if we have a host compiler available.
if conf.CC():
@@ -634,6 +634,7 @@
cmake_cmd = ['/usr/local/bin/cmake', '-G', 'Ninja',
conf.lldbsrcdir(),
+ '-DLLVM_TARGETS_TO_BUILD=X86',
'-DCMAKE_BUILD_TYPE={}'.format(cmake_build_type),
'-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
'-DCMAKE_MAKE_PROGRAM={}'.format(NINJA),
