diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-10-01 18:58:59 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-10-01 18:58:59 +0000 |
| commit | d6e511a353045e211197d613dd8fd7363bc4d56d (patch) | |
| tree | 1b7af454b4024b68c7b6829baa0fb9421be4d1f3 /cmake/config-ix.cmake | |
| parent | 64568dafdc1379e073c2f164a6774cf2ef4fd5f7 (diff) | |
[CMake] Only add an OS to the supported OS lists if there are supported architectures for that OS.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@249054 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/config-ix.cmake')
| -rw-r--r-- | cmake/config-ix.cmake | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index f07b10016..b1d564d56 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -348,10 +348,13 @@ if(APPLE) set(DARWIN_10.4_BUILTIN_MIN_VER_FLAG -mmacosx-version-min=${DARWIN_10.4_BUILTIN_MIN_VER}) set(DARWIN_10.4_SKIP_CC_KEXT On) - list(APPEND BUILTIN_SUPPORTED_OS 10.4) darwin_test_archs(10.4 DARWIN_10.4_ARCHS ${toolchain_arches}) + message(STATUS "OSX 10.4 supported arches: ${DARWIN_10.4_ARCHS}") + if(DARWIN_10.4_ARCHES) + list(APPEND BUILTIN_SUPPORTED_OS 10.4) + endif() if(DARWIN_iossim_SYSROOT) set(DARWIN_iossim_CFLAGS @@ -366,13 +369,15 @@ if(APPLE) set(DARWIN_iossim_BUILTIN_MIN_VER_FLAG -mios-simulator-version-min=${DARWIN_iossim_BUILTIN_MIN_VER}) - 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}) message(STATUS "iOS Simulator supported arches: ${DARWIN_iossim_ARCHS}") + if(DARWIN_iossim_ARCHS) + list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim) + list(APPEND BUILTIN_SUPPORTED_OS iossim) + endif() foreach(arch ${DARWIN_iossim_ARCHS}) list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch}) set(CAN_TARGET_${arch} 1) @@ -392,13 +397,15 @@ if(APPLE) set(DARWIN_ios_BUILTIN_MIN_VER_FLAG -miphoneos-version-min=${DARWIN_ios_BUILTIN_MIN_VER}) - list(APPEND SANITIZER_COMMON_SUPPORTED_OS ios) - list(APPEND BUILTIN_SUPPORTED_OS ios) - list(APPEND PROFILE_SUPPORTED_OS ios) darwin_test_archs(ios DARWIN_ios_ARCHS ${toolchain_arches}) message(STATUS "iOS supported arches: ${DARWIN_ios_ARCHS}") + if(DARWIN_ios_ARCHS) + list(APPEND SANITIZER_COMMON_SUPPORTED_OS ios) + list(APPEND BUILTIN_SUPPORTED_OS ios) + list(APPEND PROFILE_SUPPORTED_OS ios) + endif() foreach(arch ${DARWIN_ios_ARCHS}) list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch}) set(CAN_TARGET_${arch} 1) |