[compiler-rt] r246501 - [CMake] Enable building builtins for iOS and iOS simulator.

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Mon Aug 31 17:26:02 2015
New Revision: 246501

URL: http://llvm.org/viewvc/llvm-project?rev=246501&view=rev
Log:
[CMake] Enable building builtins for iOS and iOS simulator.

Building iOS does respect COMPILER_RT_ENABLE_IOS.

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake
    compiler-rt/trunk/lib/builtins/CMakeLists.txt

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=246501&r1=246500&r2=246501&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Mon Aug 31 17:26:02 2015
@@ -285,6 +285,7 @@ if(APPLE)
   # Note: In order to target x86_64h on OS X the minimum deployment target must
   # be 10.8 or higher.
   set(SANITIZER_COMMON_SUPPORTED_OS osx)
+  set(BUILTIN_SUPPORTED_OS osx)
   if(NOT SANITIZER_MIN_OSX_VERSION)
     string(REGEX MATCH "-mmacosx-version-min=([.0-9]+)"
            MACOSX_VERSION_MIN_FLAG "${CMAKE_CXX_FLAGS}")
@@ -346,6 +347,7 @@ if(APPLE)
         -isysroot ${IOSSIM_SDK_DIR})
 
       list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim)
+      list(APPEND BUILTIN_SUPPORTED_OS iossim)
       darwin_test_archs(iossim
         DARWIN_iossim_ARCHS
         ${toolchain_arches})
@@ -367,6 +369,7 @@ if(APPLE)
         -isysroot ${IOS_SDK_DIR})
 
       list(APPEND SANITIZER_COMMON_SUPPORTED_OS ios)
+      list(APPEND BUILTIN_SUPPORTED_OS ios)
       darwin_test_archs(ios
         DARWIN_ios_ARCHS
         ${toolchain_arches})

Modified: compiler-rt/trunk/lib/builtins/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/CMakeLists.txt?rev=246501&r1=246500&r2=246501&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/builtins/CMakeLists.txt Mon Aug 31 17:26:02 2015
@@ -309,7 +309,7 @@ set(arm64_SOURCES ${aarch64_SOURCES})
 add_custom_target(builtins)
 
 if (APPLE)
-  foreach (os osx)
+  foreach (os ${BUILTIN_SUPPORTED_OS})
     list_union(DARWIN_BUILTIN_ARCHS DARWIN_${os}_ARCHS BUILTIN_SUPPORTED_ARCH)
     set(${os}_builtin_libs)
     set(${os}_builtin_lipo_flags)