[zorg] r195909 - Temporary workaround till all the slaves will be configured to have C_COMPILER and CXX_COMPILER set locally. Will be rolled back later.

[Galina Kistanova]

Author: gkistanova
Date: Thu Nov 28 00:33:26 2013
New Revision: 195909

URL: http://llvm.org/viewvc/llvm-project?rev=195909&view=rev
Log:
Temporary workaround till all the slaves will be configured to have C_COMPILER and CXX_COMPILER set locally. Will be rolled back later.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=195909&r1=195908&r2=195909&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Thu Nov 28 00:33:26 2013
@@ -87,12 +87,27 @@ def getClangAndLLDBuildFactory(
     if buildWithSanitizerOptions:
         options += buildWithSanitizerOptions
 
+    # FIXME: This is a temporary workaround till all the slaves will
+    # be configured to have C_COMPILER and CXX_COMPILER set locally.
+    # Will be rolled back later.
+    # cmakeCommand = [
+        # "cmake",
+        # "-DCMAKE_BUILD_TYPE=Release",
+        # "-DLLVM_ENABLE_ASSERTIONS=ON",
+        # "-DCMAKE_CXX_FLAGS=\"%s\"" % (" ".join(options)),
+        # "-DLLVM_LIT_ARGS=\"-v\"",
+        # "-G", "Ninja",
+        # "../%s" % llvm_srcdir]
+
     cmakeCommand = [
         "cmake",
         "-DCMAKE_BUILD_TYPE=Release",
-        "-DLLVM_ENABLE_ASSERTIONS=ON",
-        "-DCMAKE_C_COMPILER=clang",
-        "-DCMAKE_CXX_COMPILER=clang++",
+        "-DLLVM_ENABLE_ASSERTIONS=ON"]
+    if buildWithSanitizerOptions:
+        cmakeCommand += [
+            "-DCMAKE_C_COMPILER=clang",
+            "-DCMAKE_CXX_COMPILER=clang++"]
+    cmakeCommand += [
         "-DCMAKE_CXX_FLAGS=\"%s\"" % (" ".join(options)),
         "-DLLVM_LIT_ARGS=\"-v\"",
         "-G", "Ninja",