[zorg] r282120 - Ensure that check-cfi dependencies are built correctly when testing compiler-rt as an external project.

[Peter Collingbourne via llvm-commits]

Author: pcc
Date: Wed Sep 21 17:42:14 2016
New Revision: 282120

URL: http://llvm.org/viewvc/llvm-project?rev=282120&view=rev
Log:
Ensure that check-cfi dependencies are built correctly when testing compiler-rt as an external project.

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=282120&r1=282119&r2=282120&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Wed Sep 21 17:42:14 2016
@@ -226,7 +226,9 @@ fi
 
 if [ "$PLATFORM" == "Linux" -a "$CHECK_CFI" == "1" ]; then
   echo @@@BUILD_STEP run 64-bit cfi unit tests@@@
-  (cd llvm_build64 && make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
+  # FIXME: Make these true dependencies of check-cfi-and-supported when
+  # compiler-rt is configured as an external project.
+  (cd llvm_build64 && make -j$MAKE_JOBS LLVMgold opt sanstats && make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
 fi
 
 echo @@@BUILD_STEP run sanitizer_common tests@@@