Skip to content

Commit 0b4fba8

Browse files
author
Chris Bieneman
committed
[CMake] Enable building builtins for iOS and iOS simulator.
Building iOS does respect COMPILER_RT_ENABLE_IOS. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@246501 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent f04a02f commit 0b4fba8

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

cmake/config-ix.cmake

+3
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ if(APPLE)
285285
# Note: In order to target x86_64h on OS X the minimum deployment target must
286286
# be 10.8 or higher.
287287
set(SANITIZER_COMMON_SUPPORTED_OS osx)
288+
set(BUILTIN_SUPPORTED_OS osx)
288289
if(NOT SANITIZER_MIN_OSX_VERSION)
289290
string(REGEX MATCH "-mmacosx-version-min=([.0-9]+)"
290291
MACOSX_VERSION_MIN_FLAG "${CMAKE_CXX_FLAGS}")
@@ -346,6 +347,7 @@ if(APPLE)
346347
-isysroot ${IOSSIM_SDK_DIR})
347348

348349
list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim)
350+
list(APPEND BUILTIN_SUPPORTED_OS iossim)
349351
darwin_test_archs(iossim
350352
DARWIN_iossim_ARCHS
351353
${toolchain_arches})
@@ -367,6 +369,7 @@ if(APPLE)
367369
-isysroot ${IOS_SDK_DIR})
368370

369371
list(APPEND SANITIZER_COMMON_SUPPORTED_OS ios)
372+
list(APPEND BUILTIN_SUPPORTED_OS ios)
370373
darwin_test_archs(ios
371374
DARWIN_ios_ARCHS
372375
${toolchain_arches})

lib/builtins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ set(arm64_SOURCES ${aarch64_SOURCES})
309309
add_custom_target(builtins)
310310

311311
if (APPLE)
312-
foreach (os osx)
312+
foreach (os ${BUILTIN_SUPPORTED_OS})
313313
list_union(DARWIN_BUILTIN_ARCHS DARWIN_${os}_ARCHS BUILTIN_SUPPORTED_ARCH)
314314
set(${os}_builtin_libs)
315315
set(${os}_builtin_lipo_flags)

0 commit comments

Comments
 (0)