[zorg] r295785 - Added a workaround for Windows paths in cmake arguments.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Tue Feb 21 17:12:44 2017
New Revision: 295785

URL: http://llvm.org/viewvc/llvm-project?rev=295785&view=rev
Log:
Added a workaround for Windows paths in cmake arguments.

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

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py?rev=295785&r1=295784&r2=295785&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py Tue Feb 21 17:12:44 2017
@@ -143,12 +143,19 @@ def getSanitizerWindowsBuildFactory(
 
     # Get absolute path to clang-cl.
     clang_cl = "%(workdir)s/" + build_dir + "/bin/clang-cl"
+    # Cmake does not accept Windows directory separators in arguments,
+    # and does not normalize the input paths to make them cmake-friendly.
+    # To work around this issue we define env CC and CXX vars for the
+    # built compiler rather than passing that with CMAKE_C_COMPILER, and
+    # CMAKE_CXX_COMPILER args.
     f.addStep(ShellCommand(name='cmake',
-                           command=[cmake, "-G", "Ninja", "../llvm",
+                           command=[
+                               "env",
+                               WithProperties("CC=" + clang_cl),
+                               WithProperties("CXX=" + clang_cl),
+                               cmake, "-G", "Ninja", "../llvm",
                                "-DCMAKE_BUILD_TYPE="+config,
                                "-DLLVM_ENABLE_ASSERTIONS=ON",
-                               WithProperties("-DCMAKE_C_COMPILER="+clang_cl),
-                               WithProperties("-DCMAKE_CXX_COMPILER="+clang_cl),
                                "-DLLVM_USE_SANITIZER=Address",
                                "-DLLVM_USE_SANITIZE_COVERAGE=YES"]
                                + extra_cmake_args,