[zorg] r276483 - [GreenDragon] Setup the path for libtool

[Bruno Cardoso Lopes via llvm-commits]

Author: bruno
Date: Fri Jul 22 17:22:38 2016
New Revision: 276483

URL: http://llvm.org/viewvc/llvm-project?rev=276483&view=rev
Log:
[GreenDragon] Setup the path for libtool

CMAKE's find_program will find libtool on macosx 10.11 under /usr/bin.
Because of libLTO, we want it to find the tool under the toolchain
instead - change build.py to pass the path down to CMAKE.

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=276483&r1=276482&r2=276483&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Fri Jul 22 17:22:38 2016
@@ -191,6 +191,10 @@ def cmake_builder(target):
     cmake_cmd += ["-DPACKAGE_VERSION=3.8.0",
                   "-DCMAKE_MACOSX_RPATH=On"]
 
+    libtool_path = query_sys_tool("macosx", "libtool")
+    if libtool_path:
+        cmake_cmd += ['-DCMAKE_LIBTOOL=' + libtool_path]
+
     if compiler_flags:
         cmake_cmd += ["-DCMAKE_C_FLAGS={}".format(' '.join(compiler_flags)),
                       "-DCMAKE_CXX_FLAGS={}".format(' '.join(compiler_flags))]
@@ -270,6 +274,7 @@ def clang_builder(target):
         sdk_name = 'macosx'
 
         sdkroot = query_sdk_path(sdk_name)
+        libtool_path = query_sys_tool(sdk_name, "libtool")
 
         next_section("Setup debug-info tests")
         run_ws(['rm', '-rf', 'llvm/tools/clang/test/debuginfo-tests'])
@@ -320,6 +325,9 @@ def clang_builder(target):
              '-DCMAKE_MACOSX_RPATH=On',
             ]
 
+            if libtool_path:
+                cmake_command += ['-DCMAKE_LIBTOOL=' + libtool_path]
+
             if conf.CC():
                 cmake_command.extend(['-DCMAKE_C_COMPILER=' + conf.CC(),
                           '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"])