<div dir="ltr">Hi Galina,<div><br></div><div>Can you please reconfigure [restart?] the LLVM master today?</div><div>Sorry for not making the config right from the first try.</div><div>--</div><div>Thanks,</div><div>Timur</div><div><br><div class="gmail_quote">On Wed Feb 18 2015 at 7:25:30 PM Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com">timurrrr@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: timurrrr<br>
Date: Wed Feb 18 10:19:54 2015<br>
New Revision: 229693<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229693&view=rev" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-<u></u>project?rev=229693&view=rev</a><br>
Log:<br>
[sanitizer-windows bot] Follow-up to r229537: fix compiler-rt path and CMake invocation<br>
<br>
Modified:<br>
    zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py<br>
<br>
Modified: zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py?rev=229693&r1=229692&r2=229693&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-<u></u>project/zorg/trunk/zorg/<u></u>buildbot/builders/<u></u>SanitizerBuilderWindows.py?<u></u>rev=229693&r1=229692&r2=<u></u>229693&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py (original)<br>
+++ zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py Wed Feb 18 10:19:54 2015<br>
@@ -24,7 +24,7 @@ def getSource(f,llvmTopDir='llvm')<u></u>:<br>
                   mode='update',<br>
                   baseURL='<a href="http://llvm.org/svn/llvm-project/compiler-rt/" target="_blank" class="cremed">http://llvm.org/svn/<u></u>llvm-project/compiler-rt/</a>',<br>
                   defaultBranch='trunk',<br>
-                  workdir='%s/tools/compiler-rt' % llvmTopDir))<br>
+                  workdir='%s/projects/compiler-<u></u>rt' % llvmTopDir))<br>
     return f<br>
<br>
 def getSanitizerWindowsBuildFactor<u></u>y(<br>
@@ -61,17 +61,12 @@ def getSanitizerWindowsBuildFactor<u></u>y(<br>
                 doStepIf=cleanBuildRequested<br>
                 ))<br>
<br>
-    f.addStep(ShellCommand(name='<u></u>cmakegen',<br>
+    f.addStep(ShellCommand(name='<u></u>cmake',<br>
                            command=[cmake, "-G", "Ninja", "../llvm",<br>
                                     "-DCMAKE_BUILD_TYPE="+config,<br>
                                     "-DLLVM_ENABLE_ASSERTIONS=ON"]<br>
                                    + extra_cmake_args,<br>
-                           workdir=build_dir))<br>
-<br>
-    f.addStep(ShellCommand(name='<u></u>cmake',<br>
-                           command=['cmakegen.bat'],<br>
                            haltOnFailure=True,<br>
-                           description='cmake gen',<br>
                            workdir=build_dir))<br>
<br>
     # Build compiler-rt first to speed up detection of Windows-specific<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank" class="cremed">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" class="cremed">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div>