[PATCH] D30467: Use relative path to clang-cl
Zachary Turner via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 1 09:06:33 PST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL296639: [Sanitizer Win] Use relative path to clang-cl (authored by zturner).
Changed prior to commit:
https://reviews.llvm.org/D30467?vs=90192&id=90193#toc
Repository:
rL LLVM
https://reviews.llvm.org/D30467
Files:
zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
Index: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
===================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
@@ -141,14 +141,14 @@
extract_fn=extractSlaveEnvironment,
env=Property('slave_env')))
- # Get absolute path to clang-cl.
- clang_cl = "%(workdir)s/" + build_dir + "/bin/clang-cl"
+ # clang-cl.exe should already be on the path (because of the previous step)
+ # so we don't need to specify its path, cmake should be able to find it.
f.addStep(ShellCommand(name='cmake',
command=[cmake, "-G", "Ninja", "../llvm",
"-DCMAKE_BUILD_TYPE="+config,
"-DLLVM_ENABLE_ASSERTIONS=ON",
- WithProperties("-DCMAKE_C_COMPILER="+clang_cl),
- WithProperties("-DCMAKE_CXX_COMPILER="+clang_cl),
+ "-DCMAKE_C_COMPILER=clang-cl.exe",
+ "-DCMAKE_CXX_COMPILER=clang-cl.exe",
"-DLLVM_USE_SANITIZER=Address",
"-DLLVM_USE_SANITIZE_COVERAGE=YES"]
+ extra_cmake_args,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30467.90193.patch
Type: text/x-patch
Size: 1385 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170301/64164758/attachment.bin>
More information about the llvm-commits
mailing list