[zorg] r272707 - Make sure cmake flags are used in both kinds of builds

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Tue Jun 14 15:45:40 2016
New Revision: 272707

URL: http://llvm.org/viewvc/llvm-project?rev=272707&view=rev
Log:
Make sure cmake flags are used in both kinds of builds

Modified:
    zorg/trunk/test/jenkins/test_build.py
    zorg/trunk/zorg/jenkins/build.py

Modified: zorg/trunk/test/jenkins/test_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/test/jenkins/test_build.py?rev=272707&r1=272706&r2=272707&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Tue Jun 14 15:45:40 2016
@@ -158,3 +158,6 @@
 # RUN: python %{src_root}/zorg/jenkins/build.py cmake all --globalisel | FileCheck --check-prefix CHECK-GISEL %s
 # CHECK-GISEL: '/usr/local/bin/cmake' '-G' 'Ninja'
 # CHECK-GISEL: '-DLLVM_BUILD_GLOBAL_ISEL=ON'
+
+# RUN: python %{src_root}/zorg/jenkins/build.py clang all --lto --cmake-flag="-DFOO" | FileCheck --check-prefix CHECK-CMAKEFLAGS %s
+# CHECK-CMAKEFLAGS: '-DFOO'

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=272707&r1=272706&r2=272707&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Tue Jun 14 15:45:40 2016
@@ -331,6 +331,12 @@ def clang_builder(target):
                 cmake_command.extend(["-DLLVM_PARALLEL_LINK_JOBS=" + str(max_link_jobs())])
             else:
                 cmake_command.extend(['-DLLVM_ENABLE_LTO=Off'])
+                cmake_command.extend([
+                    '-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -gline-tables-only -DNDEBUG',
+                    '-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -gline-tables-only -DNDEBUG'])
+
+            for flag in conf.cmake_flags:
+                cmake_command += [flag]
 
             cmake_command.append("{}/llvm".format(conf.workspace))
             run_cmd(os.path.join(clang_br, 'Build'), cmake_command)