[zorg] r259849 - Fixup cmake detection on green dragon

Chris Matthews via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 4 15:40:42 PST 2016


Author: cmatthews
Date: Thu Feb  4 17:40:41 2016
New Revision: 259849

URL: http://llvm.org/viewvc/llvm-project?rev=259849&view=rev
Log:
Fixup cmake detection on green dragon

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=259849&r1=259848&r2=259849&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Thu Feb  4 17:40:41 2016
@@ -263,7 +263,7 @@ def clang_builder(target):
                            './Build',
                            './Root'])
             install_prefix =  conf.installdir()
-            cmake_command = ["/usr/bin/xcrun", "cmake", '-G', 'Ninja', '-C',
+            cmake_command = ["/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',
@@ -280,6 +280,9 @@ def clang_builder(target):
             '-DLLVM_INCLUDE_TESTS=On',
             '-DCLANG_INCLUDE_TESTS=On',
             '-DLLVM_INCLUDE_UTILS=On'
+            '-DLIBCXX_INSTALL_HEADERS=On',
+            '-DLIBCXX_OVERRIDE_DARWIN_INSTALL=On',
+            '-DLIBCXX_INSTALL_LIBRARY=Off',
             ]
 
             if conf.lto:




More information about the llvm-commits mailing list