[zorg] r368955 - [LLDB] Honor extra compiler flags

[Jonas Devlieghere via llvm-commits]

Author: jdevlieghere
Date: Wed Aug 14 21:05:18 2019
New Revision: 368955

URL: http://llvm.org/viewvc/llvm-project?rev=368955&view=rev
Log:
[LLDB] Honor extra compiler flags

Modified:
    zorg/trunk/zorg/jenkins/monorepo_build.py

Modified: zorg/trunk/zorg/jenkins/monorepo_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/monorepo_build.py?rev=368955&r1=368954&r2=368955&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/monorepo_build.py (original)
+++ zorg/trunk/zorg/jenkins/monorepo_build.py Wed Aug 14 21:05:18 2019
@@ -527,28 +527,43 @@ def lldb_cmake_builder(target, variant=N
                  '-DLLVM_LIT_ARGS={}'.format(' '.join(lit_args)),
                  '-DLLVM_VERSION_PATCH=99']
 
+
     if variant == 'sanitized':
-        cmake_cmd.extend(['-DLLVM_TARGETS_TO_BUILD=X86',
-                          '-DLLVM_USE_SANITIZER=Address;Undefined'])
+        cmake_cmd.extend([
+            '-DLLVM_TARGETS_TO_BUILD=X86',
+            '-DLLVM_USE_SANITIZER=Address;Undefined'
+        ])
         # There is no need to compile the lldb tests with an asanified compiler
         # if we have a host compiler available.
         if conf.CC():
-            cmake_cmd.extend(['-DLLDB_TEST_USE_CUSTOM_C_COMPILER=On',
-                       '-DLLDB_TEST_USE_CUSTOM_CXX_COMPILER=On',
-                       '-DLLDB_TEST_C_COMPILER=' + conf.CC(),
-                       '-DLLDB_TEST_CXX_COMPILER=' + conf.CC() + "++"])
-
-    if variant == 'matrix' and conf.lldbtestcompiler():
-        cmake_cmd.extend(['-DLLDB_TEST_USE_CUSTOM_C_COMPILER=On',
+            cmake_cmd.extend([
+                '-DLLDB_TEST_USE_CUSTOM_C_COMPILER=On',
+                '-DLLDB_TEST_USE_CUSTOM_CXX_COMPILER=On',
+                '-DLLDB_TEST_C_COMPILER=' + conf.CC(),
+                '-DLLDB_TEST_CXX_COMPILER=' + conf.CC() + "++"
+            ])
+
+    if conf.compiler_flags:
+        cmake_cmd.extend([
+            "-DCMAKE_C_FLAGS={}".format(' '.join(conf.compiler_flags)),
+            "-DCMAKE_CXX_FLAGS={}".format(' '.join(conf.compiler_flags))
+        ])
+
+    if conf.lldbtestcompiler():
+        cmake_cmd.extend([
+            '-DLLDB_TEST_USE_CUSTOM_C_COMPILER=On',
             '-DLLDB_TEST_USE_CUSTOM_CXX_COMPILER=On',
             '-DLLDB_TEST_C_COMPILER=' + conf.lldbtestcompiler(),
-            '-DLLDB_TEST_CXX_COMPILER=' + conf.lldbtestcompiler() + "++"])
+            '-DLLDB_TEST_CXX_COMPILER=' + conf.lldbtestcompiler() + "++"
+        ])
 
     cmake_cmd.extend(conf.cmake_flags)
 
     if conf.CC():
-        cmake_cmd.extend(['-DCMAKE_C_COMPILER=' + conf.CC(),
-                          '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"])
+        cmake_cmd.extend([
+            '-DCMAKE_C_COMPILER=' + conf.CC(),
+            '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"
+        ])
 
 
     header("Clean")