[compiler-rt] r248939 - [CMake] [Darwin] [builtins] Change condition for skipping cc_kext to be setting based.

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Wed Sep 30 15:25:10 2015
New Revision: 248939

URL: http://llvm.org/viewvc/llvm-project?rev=248939&view=rev
Log:
[CMake] [Darwin] [builtins] Change condition for skipping cc_kext to be setting based.

This is needed because we need to skip cc_kext generation for more than just the simulator builds.

Modified:
    compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake
    compiler-rt/trunk/cmake/config-ix.cmake

Modified: compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake?rev=248939&r1=248938&r2=248939&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Wed Sep 30 15:25:10 2015
@@ -270,7 +270,7 @@ macro(darwin_add_builtin_libraries)
     endforeach()
 
     # Don't build cc_kext libraries for simulator platforms
-    if(NOT ${os} MATCHES ".*sim$")
+    if(NOT DARWIN_${os}_SKIP_CC_KEXT)
       foreach (arch ${DARWIN_BUILTIN_ARCHS})
         # By not specifying MIN_VERSION this only reads the OS and OS-arch lists.
         # We don't want to filter out the builtins that are present in libSystem

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=248939&r1=248938&r2=248939&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Wed Sep 30 15:25:10 2015
@@ -356,6 +356,7 @@ if(APPLE)
 
       list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim)
       list(APPEND BUILTIN_SUPPORTED_OS iossim)
+      set(DARWIN_iossim_SKIP_CC_KEXT On)
       darwin_test_archs(iossim
         DARWIN_iossim_ARCHS
         ${toolchain_arches})