[CMake] Enable building builtins for iOS and iOS simulator.

Building iOS does respect COMPILER_RT_ENABLE_IOS.

llvm-svn: 246501

compiler-rt/cmake/config-ix.cmake

@@ -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})

compiler-rt/lib/builtins/CMakeLists.txt

@@ -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)