[zorg] r261937 - Enable CMAKE_MACOSX_RPATH to fix asan libs not being found in stage 2 asan builds and fix the package version to match open source relase number

[Marc Schifer via llvm-commits]

Author: mschifer
Date: Thu Feb 25 17:54:25 2016
New Revision: 261937

URL: http://llvm.org/viewvc/llvm-project?rev=261937&view=rev
Log:
Enable CMAKE_MACOSX_RPATH to fix asan libs not being found in stage 2 asan builds and fix the package version to match open source relase number

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

Modified: zorg/trunk/test/jenkins/test_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/test/jenkins/test_build.py?rev=261937&r1=261936&r2=261937&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Thu Feb 25 17:54:25 2016
@@ -42,6 +42,8 @@
 # CHECK-SIMPLE: '-DLLVM_INCLUDE_TESTS=On'
 # CHECK-SIMPLE: '-DCLANG_INCLUDE_TESTS=On'
 # CHECK-SIMPLE: '-DLLVM_INCLUDE_UTILS=On'
+# CHECK-SIMPLE: '-DPACKAGE_VERSION=3.8.0'
+# CHECK-SIMPLE: '-DCMAKE_MACOSX_RPATH=On'
 # CHECK-SIMPLE: '-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -gline-tables-only -DNDEBUG'
 # CHECK-SIMPLE: '-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -gline-tables-only -DNDEBUG'
 # CHECK-SIMPLE-NOT: '-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -flto -gline-tables-only -DNDEBUG'

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=261937&r1=261936&r2=261937&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Thu Feb 25 17:54:25 2016
@@ -165,6 +165,9 @@ def cmake_builder(target):
     else:
         cmake_cmd += ['-DLLVM_BUILD_EXAMPLES=On']
 
+    cmake_cmd += ["-DPACKAGE_VERSION=3.8.0",
+                  "-DCMAKE_MACOSX_RPATH=On"]
+
     if compiler_flags:
         cmake_cmd += ["-DCMAKE_C_FLAGS={}".format(' '.join(compiler_flags)),
                       "-DCMAKE_CXX_FLAGS={}".format(' '.join(compiler_flags))]
@@ -287,6 +290,8 @@ def clang_builder(target):
             '-DLIBCXX_INSTALL_HEADERS=On',
             '-DLIBCXX_OVERRIDE_DARWIN_INSTALL=On',
             '-DLIBCXX_INSTALL_LIBRARY=Off',
+             '-DPACKAGE_VERSION=3.8.0',
+             '-DCMAKE_MACOSX_RPATH=On',
             ]
 
             if conf.CC():