[zorg] r259957 - Added an isMSVC parameter to the ClangAndLLDBuilder.py file to deal with a new MSVC based bot.
Galina Kistanova via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 5 15:53:28 PST 2016
Author: gkistanova
Date: Fri Feb 5 17:53:28 2016
New Revision: 259957
URL: http://llvm.org/viewvc/llvm-project?rev=259957&view=rev
Log:
Added an isMSVC parameter to the ClangAndLLDBuilder.py file to deal with a new MSVC based bot.
Patch by Mike Edwards.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=259957&r1=259956&r2=259957&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Feb 5 17:53:28 2016
@@ -151,6 +151,7 @@ def _get_clang_fast_builders():
"-DCLANG_BUILD_EXAMPLES:BOOL=ON",
"-DLLVM_TARGETS_TO_BUILD=X86"],
triple="x86_64-scei-ps4",
+ isMSVC=True,
prefixCommand=None)}, # This is a designated builder, so no need to be nice.
]
Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=259957&r1=259956&r2=259957&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Fri Feb 5 17:53:28 2016
@@ -17,6 +17,7 @@ def getClangAndLLDBuildFactory(
extraCompilerOptions=None,
buildWithSanitizerOptions=None,
triple=None,
+ isMSVC=False,
prefixCommand=["nice", "-n", "10"] # For backward compatibility.
):
@@ -82,15 +83,19 @@ def getClangAndLLDBuildFactory(
env=merged_env))
# Create configuration files with cmake.
+ shellCommand = ["mkdir", "-p", llvm_objdir]
+ if isMSVC:
+ shellCommand = ["mkdir", llvm_objdir]
f.addStep(ShellCommand(name="create-build-dir",
- command=["mkdir", "-p", llvm_objdir],
+ command=shellCommand,
haltOnFailure=True,
description=["create build dir"],
workdir=".",
env=merged_env))
options = ["-Wdocumentation", "-Wno-documentation-deprecated-sync"]
-
+ if isMSVC:
+ options = []
if extraCompilerOptions:
options += extraCompilerOptions
@@ -124,12 +129,16 @@ def getClangAndLLDBuildFactory(
if extraCmakeOptions:
cmakeCommand += extraCmakeOptions
+ if not isMSVC:
+ cmakeCommand += [
+ "-DCMAKE_C_FLAGS=\"%s\"" % (" ".join(options)),
+ "-DCMAKE_CXX_FLAGS=\"-std=c++11 %s\"" % (" ".join(options)),
+ ]
cmakeCommand += [
- "-DCMAKE_C_FLAGS=\"%s\"" % (" ".join(options)),
- "-DCMAKE_CXX_FLAGS=\"-std=c++11 %s\"" % (" ".join(options)),
"-DLLVM_LIT_ARGS=\"-v\"",
"-G", "Ninja",
- "../%s" % llvm_srcdir]
+ "../%s" % llvm_srcdir
+ ]
# Note: ShellCommand does not pass the params with special symbols right.
# The " ".join is a workaround for this bug.
More information about the llvm-commits
mailing list