[zorg] r276699 - [GreenDragon] Setup DYLD_LIBRARY_PATH in clang_build mode

[Bruno Cardoso Lopes via llvm-commits]

Author: bruno
Date: Mon Jul 25 17:07:39 2016
New Revision: 276699

URL: http://llvm.org/viewvc/llvm-project?rev=276699&view=rev
Log:
[GreenDragon] Setup DYLD_LIBRARY_PATH in clang_build mode

cmake_build sets up DYLD_LIBRARY_PATH to tell the linker the appropriate path
to libLTO.dylib. Do the same in clang_build mode, which is the mode used
to build clang in http://lab.llvm.org:8080/green/job/clang-stage2-configure-Rlto

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=276699&r1=276698&r2=276699&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Mon Jul 25 17:07:39 2016
@@ -291,6 +291,11 @@ def clang_builder(target):
         toolchain = '/Applications/Xcode.app/Contents/Developer' \
             '/Toolchains/XcodeDefault.xctoolchain'
 
+        env = []
+        if conf.lto and conf.liblto():
+            dyld_path = conf.liblto()
+            env.extend(["env", "DYLD_LIBRARY_PATH=" + dyld_path])
+
         next_section("Build Clang")
         if conf.nobootstrap:
             if conf.debug or conf.device:
@@ -299,7 +304,7 @@ def clang_builder(target):
                            './Build',
                            './Root'])
             install_prefix =  conf.installdir()
-            cmake_command = ["/usr/local/bin/cmake", '-G', 'Ninja', '-C',
+            cmake_command = env + ["/usr/local/bin/cmake", '-G', 'Ninja', '-C',
             '{}/llvm/tools/clang/cmake/caches/Apple-stage2.cmake'.format(conf.workspace),
             '-DLLVM_ENABLE_ASSERTIONS:BOOL={}'.format("TRUE" if conf.assertions else "FALSE"),
             '-DCMAKE_BUILD_TYPE=RelWithDebInfo',