From 5e2e4834907d1bfe2387ca4194ee1177d9fbb62b Mon Sep 17 00:00:00 2001
From: Galina Kistanova <gkistanova@gmail.com>
Date: Sat, 20 Feb 2016 00:42:29 +0000
Subject: Fixed misplaced assertion.

git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@261386 91177308-0d34-0410-b5e6-96231b3b80d8
---
 zorg/buildbot/builders/ClangAndLLDBuilder.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zorg/buildbot/builders/ClangAndLLDBuilder.py b/zorg/buildbot/builders/ClangAndLLDBuilder.py
index c1d61405..348d3aa0 100644
--- a/zorg/buildbot/builders/ClangAndLLDBuilder.py
+++ b/zorg/buildbot/builders/ClangAndLLDBuilder.py
@@ -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)),
-- 
cgit v1.2.3