[zorg] r261394 - Enable compiler-rt asan dylib and build compiler-rt with new cmake cache file. This fixes the stage 2 cmake R -g Asan+Ubsan bot

[Marc Schifer via llvm-commits]

Author: mschifer
Date: Fri Feb 19 19:48:44 2016
New Revision: 261394

URL: http://llvm.org/viewvc/llvm-project?rev=261394&view=rev
Log:
Enable compiler-rt asan dylib and build compiler-rt with new cmake cache file. This fixes the stage 2 cmake R -g Asan+Ubsan bot

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=261394&r1=261393&r2=261394&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Fri Feb 19 19:48:44 2016
@@ -32,6 +32,8 @@
 # CHECK-SIMPLE: '-DLLVM_VERSION_SUFFIX=""'
 # CHECK-SIMPLE: '-DLLVM_BUILD_EXTERNAL_COMPILER_RT=On'
 # CHECK-SIMPLE: '-DCLANG_COMPILER_RT_CMAKE_ARGS
+# CHECK-SIMPLE: Apple.cmake'
+# CHECK-SIMPLE: '-DCOMPILER_RT_BUILD_SANITIZERS=On'
 # CHECK-SIMPLE: '-DCMAKE_INSTALL_PREFIX
 # CHECK-SIMPLE: '-DLLVM_ENABLE_PIC=On'
 # CHECK-SIMPLE: '-DLLVM_REPOSITORY=None'

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=261394&r1=261393&r2=261394&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Fri Feb 19 19:48:44 2016
@@ -274,7 +274,8 @@ def clang_builder(target):
             '-DLLVM_VERSION_PATCH=99',
             '-DLLVM_VERSION_SUFFIX=""',
             '-DLLVM_BUILD_EXTERNAL_COMPILER_RT=On',
-            '-DCLANG_COMPILER_RT_CMAKE_ARGS={}/llvm/tools/clang/cmake/caches/Apple-stage2.cmake'.format(conf.workspace),
+            '-DCLANG_COMPILER_RT_CMAKE_ARGS={}/llvm/projects/compiler-rt/cmake/caches/Apple.cmake'.format(conf.workspace),
+            '-DCOMPILER_RT_BUILD_SANITIZERS=On',
             '-DCMAKE_INSTALL_PREFIX={}'.format(install_prefix),
             '-DLLVM_ENABLE_PIC=On', 
             '-DLLVM_REPOSITORY={}'.format(conf._svn_url),