[zorg] r314091 - Revert "Check we test CFI before using gold" and "Switch linux bot to gold"

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Sun Sep 24 19:22:00 2017
New Revision: 314091

URL: http://llvm.org/viewvc/llvm-project?rev=314091&view=rev
Log:
Revert "Check we test CFI before using gold" and "Switch linux bot to gold"

Not needed. Problem was with the version of linker on bot.

This reverts commits r314086, 314085.

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=314091&r1=314090&r2=314091&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Sun Sep 24 19:22:00 2017
@@ -101,9 +101,6 @@ 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