Cleanup linker setup on sanitizer bots
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh
index be9f66a..464b24a 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh
@@ -12,7 +12,7 @@
export PATH="/usr/local/bin:$PATH"
LLVM=$ROOT/llvm
-CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=20"
+CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON"
clobber
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
index c0fccb2..78d44eb 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
@@ -12,7 +12,7 @@
export PATH="/usr/local/bin:$PATH"
LLVM=$ROOT/llvm
-CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=20"
+CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON"
clobber
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
index ba4241f..c376ad9 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
@@ -12,7 +12,7 @@
export PATH="/usr/local/bin:$PATH"
LLVM=$ROOT/llvm
-CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=20"
+CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON"
clobber
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_fast.sh b/zorg/buildbot/builders/sanitizers/buildbot_fast.sh
index 6bcc507..91f2ef2 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_fast.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_fast.sh
@@ -12,7 +12,7 @@
export PATH="/usr/local/bin:$PATH"
LLVM=$ROOT/llvm
-CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release"
+CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON"
clobber
@@ -20,8 +20,6 @@
build_stage1_clang_at_revison
-CMAKE_COMMON_OPTIONS="$CMAKE_COMMON_OPTIONS -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=lld"
-
if ccache -s ; then
CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_CCACHE_BUILD=ON"
fi
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
index 384cd84..f2b0927 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
@@ -103,7 +103,7 @@
function common_stage2_variables {
cmake_stage2_common_options="\
- ${CMAKE_COMMON_OPTIONS} ${STAGE1_AS_COMPILER}"
+ ${CMAKE_COMMON_OPTIONS} ${STAGE1_AS_COMPILER} -DLLVM_USE_LINKER=lld"
}
function build_stage2 {
@@ -222,13 +222,17 @@
local build_dir=llvm_build2_${sanitizer_name}
local clang_path=$ROOT/${STAGE2_DIR}/bin
- local cmake_stage3_options="${CMAKE_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${clang_path}/clang -DCMAKE_CXX_COMPILER=${clang_path}/clang++"
- cmake_stage3_options="${cmake_stage3_options} -DLLVM_ENABLE_PROJECTS='clang'"
-
echo @@@BUILD_STEP build stage3/$sanitizer_name clang@@@
rm -rf ${build_dir}
mkdir -p ${build_dir}
- (cd ${build_dir} && cmake ${cmake_stage3_options} $LLVM && ninja clang) || \
+ (cd ${build_dir} &&
+ cmake ${CMAKE_COMMON_OPTIONS} \
+ -DLLVM_ENABLE_PROJECTS='clang' \
+ -DCMAKE_C_COMPILER=${clang_path}/clang \
+ -DCMAKE_CXX_COMPILER=${clang_path}/clang++ \
+ -DLLVM_USE_LINKER=lld \
+ $LLVM && \
+ ninja clang) || \
echo $step_result
}
