[zorg] r314086 - [zorg] Check we test CFI before using gold

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Sun Sep 24 15:32:42 2017
New Revision: 314086

URL: http://llvm.org/viewvc/llvm-project?rev=314086&view=rev
Log:
[zorg] Check we test CFI before using gold

Gold is not available on some bots, but it's requirement for CFI tests.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh?rev=314086&r1=314085&r2=314086&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Sun Sep 24 15:32:42 2017
@@ -29,7 +29,7 @@ MAKE_JOBS=${MAX_MAKE_JOBS:-16}
 LLVM=$ROOT/llvm
 ZLIB=$ROOT/zlib
 COMPILER_RT=$LLVM/projects/compiler-rt
-CMAKE_COMMON_OPTIONS="-DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=10 -DLLVM_USE_LINKER=gold"
+CMAKE_COMMON_OPTIONS="-DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=10"
 ENABLE_LIBCXX_FLAG=
 if [ "$PLATFORM" == "Darwin" ]; then
   CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DPYTHON_EXECUTABLE=/usr/bin/python"
@@ -101,6 +101,9 @@ case "$ARCH" in
   ;;
 esac
 
+if [ "$CHECK_CFI" == "1" ]; then
+  CMAKE_COMMON_OPTIONS="$CMAKE_COMMON_OPTIONS -DLLVM_USE_LINKER=gold"
+fi
 
 echo @@@BUILD_STEP update@@@
 buildbot_update