aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Gallop <russell.gallop@gmail.com>2019-10-18 09:49:42 +0000
committerRussell Gallop <russell.gallop@gmail.com>2019-10-18 09:49:42 +0000
commit3d1607408218fd4a733325ddfb6bdf0a28a62181 (patch)
tree28cccf09fba5a54af6eb3e0720b914e20838c248
parent7d3471e2290852cbea266c5075d75b44b6f74caf (diff)
Remove -DLLVM_USE_LINKER from Windows self host bots.
LLVM_USE_LINKER sets the -fuse-ld. This is redundant as the linker is set to lld-link. Differential Revision: https://reviews.llvm.org/D69098 git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@375212 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--zorg/buildbot/builders/annotated/clang-windows.py6
-rw-r--r--zorg/buildbot/builders/annotated/sanitizer-windows.py6
2 files changed, 2 insertions, 10 deletions
diff --git a/zorg/buildbot/builders/annotated/clang-windows.py b/zorg/buildbot/builders/annotated/clang-windows.py
index 58fe208c..15c61bff 100644
--- a/zorg/buildbot/builders/annotated/clang-windows.py
+++ b/zorg/buildbot/builders/annotated/clang-windows.py
@@ -10,15 +10,12 @@ def main(argv):
projects = ['llvm', 'clang', 'lld', 'debuginfo-tests']
stages = 2
- stage1_extra_cmake_args = [
+ extra_cmake_args = [
'-DCMAKE_BUILD_TYPE=Release',
'-DLLVM_ENABLE_PDB=ON',
'-DLLVM_ENABLE_ASSERTIONS=ON',
'-DLLVM_TARGETS_TO_BUILD=all',
]
- extra_cmake_args = stage1_extra_cmake_args + [
- '-DLLVM_USE_LINKER=lld',
- ]
check_targets = ['check-llvm', 'check-clang', 'check-lld', 'check-debuginfo']
# Check both stage 1 and stage 2.
@@ -31,7 +28,6 @@ def main(argv):
builder.run_steps(projects=projects,
stages=stages,
extra_cmake_args=extra_cmake_args,
- stage1_extra_cmake_args=stage1_extra_cmake_args,
check_targets=check_targets,
check_stages=check_stages,
compiler=compiler,
diff --git a/zorg/buildbot/builders/annotated/sanitizer-windows.py b/zorg/buildbot/builders/annotated/sanitizer-windows.py
index 3618d50a..d654e5b8 100644
--- a/zorg/buildbot/builders/annotated/sanitizer-windows.py
+++ b/zorg/buildbot/builders/annotated/sanitizer-windows.py
@@ -34,15 +34,12 @@ def main(argv):
projects = ['llvm', 'clang', 'lld', 'compiler-rt']
stages = 1
- stage1_extra_cmake_args = [
+ extra_cmake_args = [
'-DCMAKE_BUILD_TYPE=Release',
'-DLLVM_ENABLE_PDB=ON',
'-DLLVM_ENABLE_ASSERTIONS=ON',
'-DLLVM_TARGETS_TO_BUILD=X86',
]
- extra_cmake_args = stage1_extra_cmake_args + [
- '-DLLVM_USE_LINKER=lld',
- ]
check_targets = ['check-asan', 'check-asan-dynamic', 'check-sanitizer',
'check-ubsan', 'check-fuzzer', 'check-cfi',
'check-profile', 'check-builtins']
@@ -56,7 +53,6 @@ def main(argv):
builder.run_steps(stages=stages,
projects=projects,
extra_cmake_args=extra_cmake_args,
- stage1_extra_cmake_args=stage1_extra_cmake_args,
check_targets=check_targets,
compiler=compiler,
linker=linker,