diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-09-30 20:25:10 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-09-30 20:25:10 +0000 |
| commit | d823302483b4e4efe69bd2fd58623aab66e4888a (patch) | |
| tree | 645cec3a565900f1da81cde33f9202491bb764e0 | |
| parent | 422a61306e1b1bccdf1a6a24faa3dec75070a422 (diff) | |
| download | bcm5719-llvm-d823302483b4e4efe69bd2fd58623aab66e4888a.tar.gz bcm5719-llvm-d823302483b4e4efe69bd2fd58623aab66e4888a.zip | |
[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.
llvm-svn: 248939
| -rw-r--r-- | compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake | 2 | ||||
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake index 12c1747962a..e2fe795acdf 100644 --- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -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 diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 3b29f87f649..a3f2a2acc17 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -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}) |
