Skip to content

[compiler-rt] Do not search for sysroots for disabled Darwin targets #161877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[compiler-rt] Do not search for sysroots for disabled Darwin targets #161877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions compiler-rt/cmake/builtin-config-ix.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
13 changes: 6 additions & 7 deletions compiler-rt/cmake/config-ix.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down