diff --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake index b86bb1bca7cda..d76f812e8ec21 100644 --- a/compiler-rt/cmake/builtin-config-ix.cmake +++ b/compiler-rt/cmake/builtin-config-ix.cmake @@ -115,17 +115,6 @@ include(CompilerRTUtils) include(CompilerRTDarwinUtils) if(APPLE) - - find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx) - find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) - find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) - find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) - find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) - find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) - find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) - find_darwin_sdk_dir(DARWIN_xrossim_SYSROOT xrsimulator) - find_darwin_sdk_dir(DARWIN_xros_SYSROOT xros) - # Get supported architecture from SDKSettings. function(sdk_has_arch_support sdk_path os arch has_support) execute_process(COMMAND @@ -143,6 +132,7 @@ if(APPLE) endif() endfunction() + find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx) set(DARWIN_EMBEDDED_PLATFORMS) set(DARWIN_osx_BUILTIN_MIN_VER 10.7) set(DARWIN_osx_BUILTIN_MIN_VER_FLAG @@ -157,6 +147,8 @@ if(APPLE) endforeach(arch) if(COMPILER_RT_ENABLE_IOS) + find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) + find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) list(APPEND DARWIN_EMBEDDED_PLATFORMS ios) set(DARWIN_ios_MIN_VER_FLAG -miphoneos-version-min) set(DARWIN_ios_BUILTIN_MIN_VER 6.0) @@ -170,6 +162,8 @@ if(APPLE) endif() endif() if(COMPILER_RT_ENABLE_WATCHOS) + find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) + find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) list(APPEND DARWIN_EMBEDDED_PLATFORMS watchos) set(DARWIN_watchos_MIN_VER_FLAG -mwatchos-version-min) set(DARWIN_watchos_BUILTIN_MIN_VER 2.0) @@ -183,6 +177,8 @@ if(APPLE) endif() endif() if(COMPILER_RT_ENABLE_TVOS) + find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) + find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) list(APPEND DARWIN_EMBEDDED_PLATFORMS tvos) set(DARWIN_tvos_MIN_VER_FLAG -mtvos-version-min) set(DARWIN_tvos_BUILTIN_MIN_VER 9.0) @@ -196,6 +192,8 @@ if(APPLE) endif() endif() if(COMPILER_RT_ENABLE_XROS) + find_darwin_sdk_dir(DARWIN_xrossim_SYSROOT xrsimulator) + find_darwin_sdk_dir(DARWIN_xros_SYSROOT xros) list(APPEND DARWIN_EMBEDDED_PLATFORMS xros) set(DARWIN_xros_BUILTIN_ALL_POSSIBLE_ARCHS ${ARM64} ${ARM32}) set(DARWIN_xrossim_BUILTIN_ALL_POSSIBLE_ARCHS arm64) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 67db4383ec3dc..a800c43362fe9 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -408,13 +408,6 @@ if(APPLE) include(CompilerRTDarwinUtils) find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx) - find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) - find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) - find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) - find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) - find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) - find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) - if(NOT DARWIN_osx_SYSROOT) message(WARNING "Could not determine OS X sysroot, trying /usr/include") if(EXISTS /usr/include) @@ -425,6 +418,8 @@ if(APPLE) endif() if(COMPILER_RT_ENABLE_IOS) + find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) + find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) list(APPEND DARWIN_EMBEDDED_PLATFORMS ios) set(DARWIN_ios_MIN_VER 9.0) set(DARWIN_ios_MIN_VER_FLAG -miphoneos-version-min) @@ -435,6 +430,8 @@ if(APPLE) ${DARWIN_iossim_MIN_VER_FLAG}=${DARWIN_ios_MIN_VER}) endif() if(COMPILER_RT_ENABLE_WATCHOS) + find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) + find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) list(APPEND DARWIN_EMBEDDED_PLATFORMS watchos) set(DARWIN_watchos_MIN_VER 2.0) set(DARWIN_watchos_MIN_VER_FLAG -mwatchos-version-min) @@ -445,6 +442,8 @@ if(APPLE) ${DARWIN_watchossim_MIN_VER_FLAG}=${DARWIN_watchos_MIN_VER}) endif() if(COMPILER_RT_ENABLE_TVOS) + find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) + find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) list(APPEND DARWIN_EMBEDDED_PLATFORMS tvos) set(DARWIN_tvos_MIN_VER 9.0) set(DARWIN_tvos_MIN_VER_FLAG -mtvos-version-min)