[zorg] r261386 - Fixed misplaced assertion.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Fri Feb 19 18:42:29 2016
New Revision: 261386

URL: http://llvm.org/viewvc/llvm-project?rev=261386&view=rev
Log:
Fixed misplaced assertion.

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=261386&r1=261385&r2=261386&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Fri Feb 19 18:42:29 2016
@@ -13,7 +13,7 @@ def getClangAndLLDBuildFactory(
            clean=True,
            env=None,
            withLLD=True,
-           extraCmakeOptions=[],
+           extraCmakeOptions=None,
            extraCompilerOptions=None,
            buildWithSanitizerOptions=None,
            triple=None,
@@ -101,7 +101,6 @@ def getClangAndLLDBuildFactory(
     if isMSVC:
         options = []
     if extraCompilerOptions:
-        assert not any(a.startswith('-DLLVM_LIT_ARGS=') for a in extraCmakeOptions), "Please use extraLitArgs for LIT arguments instead of defining them in extraCmakeOptions."       
         options += extraCompilerOptions
 
     if buildWithSanitizerOptions:
@@ -126,8 +125,11 @@ def getClangAndLLDBuildFactory(
         cmakeCommand += [
             "-DLLVM_DEFAULT_TARGET_TRIPLE=%s" % triple
         ]
+
     if extraCmakeOptions:
+        assert not any(a.startswith('-DLLVM_LIT_ARGS=') for a in extraCmakeOptions), "Please use extraLitArgs for LIT arguments instead of defining them in extraCmakeOptions."       
         cmakeCommand += extraCmakeOptions
+
     if not isMSVC:
         cmakeCommand += [
             "-DCMAKE_C_FLAGS=\"%s\"" % (" ".join(options)),