Skip to content

build: clean up the mac catalyst flag handling in the host #31477

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

Merged
merged 1 commit into from
May 5, 2020
Merged

build: clean up the mac catalyst flag handling in the host #31477

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
28 changes: 3 additions & 25 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ function(_add_host_variant_c_compile_link_flags)
""
${ARGN})

get_maccatalyst_build_flavor(maccatalyst_build_flavor
"${SWFIT_HOST_VARIANT_SDK}" "")

set(result ${${CFLAGS_RESULT_VAR_NAME}})

is_darwin_based_sdk("${SWIFT_HOST_VARIANT_SDK}" IS_DARWIN)
Expand All @@ -102,12 +99,9 @@ function(_add_host_variant_c_compile_link_flags)
# MSVC, clang-cl, gcc don't understand -target.
if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT SWIFT_COMPILER_IS_MSVC_LIKE)
get_target_triple(target target_variant "${SWIFT_HOST_VARIANT_SDK}" "${SWIFT_HOST_VARIANT_ARCH}"
MACCATALYST_BUILD_FLAVOR "${maccatalyst_build_flavor}"
MACCATALYST_BUILD_FLAVOR ""
DEPLOYMENT_VERSION "${DEPLOYMENT_VERSION}")
list(APPEND result "-target" "${target}")
if(target_variant)
list(APPEND result "-target-variant" "${target_variant}")
endif()
endif()

set(_sysroot
Expand All @@ -133,21 +127,8 @@ function(_add_host_variant_c_compile_link_flags)
# side effects are introduced should a new search path be added.
list(APPEND result
"-arch" "${SWIFT_HOST_VARIANT_ARCH}"
"-F${SWIFT_SDK_${SWIFT_HOST_VARIANT_ARCH}_PATH}/../../../Developer/Library/Frameworks")

set(add_explicit_version TRUE)

# iOS-like and zippered libraries get their deployment version from the
# target triple
if(maccatalyst_build_flavor STREQUAL "ios-like" OR
maccatalyst_build_flavor STREQUAL "zippered")
set(add_explicit_version FALSE)
endif()

if(add_explicit_version)
list(APPEND result
"-m${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_VERSION_MIN_NAME}-version-min=${DEPLOYMENT_VERSION}")
endif()
"-F${SWIFT_SDK_${SWIFT_HOST_VARIANT_ARCH}_PATH}/../../../Developer/Library/Frameworks"
"-m${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_VERSION_MIN_NAME}-version-min=${DEPLOYMENT_VERSION}")
endif()

if(CFLAGS_ANALYZE_CODE_COVERAGE)
Expand Down Expand Up @@ -432,9 +413,6 @@ function(_add_host_variant_link_flags target)
"SHELL:-Xlinker -dead_strip")
endif()
endif()

get_maccatalyst_build_flavor(maccatalyst_build_flavor
"${SWIFT_HOST_VARIANT_SDK}" "")
endfunction()

# Add a single variant of a new Swift library.
Expand Down