[zorg] r234035 - jenkins: Simplify the CMAKE_BUILD_TYPE logic, NFC

Duncan P. N. Exon Smith dexonsmith at apple.com
Fri Apr 3 11:21:11 PDT 2015


Author: dexonsmith
Date: Fri Apr  3 13:21:11 2015
New Revision: 234035

URL: http://llvm.org/viewvc/llvm-project?rev=234035&view=rev
Log:
jenkins: Simplify the CMAKE_BUILD_TYPE logic, NFC

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

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=234035&r1=234034&r2=234035&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Fri Apr  3 13:21:11 2015
@@ -125,11 +125,12 @@ def cmake_builder(target):
         host_compiler_flags.append('-DCMAKE_C_COMPILER=' + conf.CC())
         host_compiler_flags.append('-DCMAKE_CXX_COMPILER=' + conf.CC()+"++")
 
-    type_flag = "-DCMAKE_BUILD_TYPE=Debug" if conf.debug else \
-        "-DCMAKE_BUILD_TYPE=Release"
-
     if conf.cmake_build_type:
         type_flag = "-DCMAKE_BUILD_TYPE=" + conf.cmake_build_type
+    elif conf.debug:
+        type_flag = "-DCMAKE_BUILD_TYPE=Debug"
+    else:
+        type_flag = "-DCMAKE_BUILD_TYPE=Release"
 
     env = []
     if conf.lto and conf.liblto():





More information about the llvm-commits mailing list