[zorg] r233996 - Jenkins: Add support for cmake DYLD_LIBRARY_PATH for lto

[Chris Matthews]

Author: cmatthews
Date: Thu Apr  2 21:08:45 2015
New Revision: 233996

URL: http://llvm.org/viewvc/llvm-project?rev=233996&view=rev
Log:
Jenkins: Add support for cmake DYLD_LIBRARY_PATH for lto

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=233996&r1=233995&r2=233996&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Thu Apr  2 21:08:45 2015
@@ -130,12 +130,17 @@ def cmake_builder(target):
     if conf.cmake_build_type:
         type_flag = "-DCMAKE_BUILD_TYPE=" + conf.cmake_build_type
 
-    cmake_cmd = ["/usr/local/bin/cmake",
-                 "-G", "Ninja", type_flag,
-                 asserts,
-                 "-DCMAKE_INSTALL_PREFIX=" + conf.installdir(),
-                 conf.srcdir(),
-                 '-DLLVM_LIT_ARGS=--xunit-xml-output=testresults.xunit.xml -v'] \
+    env = []
+    if conf.lto and conf.liblto():
+        dyld_path = conf.liblto()
+        env.extend(["env", "DYLD_LIBRARY_PATH=" + dyld_path])
+
+    cmake_cmd = env + ["/usr/local/bin/cmake",
+                       "-G", "Ninja", type_flag,
+                       asserts,
+                       "-DCMAKE_INSTALL_PREFIX=" + conf.installdir(),
+                       conf.srcdir(),
+                       '-DLLVM_LIT_ARGS=--xunit-xml-output=testresults.xunit.xml -v'] \
         + lto_flags + host_compiler_flags
 
     if target == 'all' or target == 'build':
@@ -143,18 +148,18 @@ def cmake_builder(target):
         run_cmd(conf.builddir(), cmake_cmd)
         footer()
         header("Ninja build")
-        run_cmd(conf.builddir(), ["/usr/local/bin/ninja"])
+        run_cmd(conf.builddir(), env + ["/usr/local/bin/ninja"])
         footer()
 
     if target == 'all' or target == 'test':
         header("Ninja test")
-        run_cmd(conf.builddir(), ["/usr/local/bin/ninja",
-                                  'check', 'check-clang'])
+        run_cmd(conf.builddir(), env + ["/usr/local/bin/ninja",
+                                        'check', 'check-clang'])
         footer()
 
     if target == 'all' or target == 'testlong':
         header("Ninja test")
-        run_cmd(conf.builddir(), ["/usr/local/bin/ninja", 'check-all'])
+        run_cmd(conf.builddir(), env + ["/usr/local/bin/ninja", 'check-all'])
         footer()