Skip to content

[cmake, 6.3] fix libswiftCompatibilitySpan for maccatalyst builds #86071

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

Open
glessard wants to merge 1 commit into
base: release/6.3
Choose a base branch
from
Open

[cmake, 6.3] fix libswiftCompatibilitySpan for maccatalyst builds #86071

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
10 changes: 7 additions & 3 deletions stdlib/toolchain/CompatibilitySpan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED SWIFT_STDLIB_LIBRARY_BUILD_TY

set(library_name "swiftCompatibilitySpan")

# The correct fix would be to add this to the following to the invocation of add_swift_target_library
# DEPLOYMENT_VERSION_MACCATALYST ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_MACCATALYST}
# but the underlying logic takes the deployment version from the cache instead
# so for now we override those values locally
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.14.4")
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST "13.1")

add_swift_target_library("${library_name}" ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
FakeStdlib.swift
../../public/core/Span/MutableRawSpan.swift
Expand All @@ -13,8 +20,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED SWIFT_STDLIB_LIBRARY_BUILD_TY

TARGET_SDKS ${SWIFT_APPLE_PLATFORMS}

LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

SWIFT_COMPILE_FLAGS
${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-parse-stdlib
Expand All @@ -28,7 +33,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED SWIFT_STDLIB_LIBRARY_BUILD_TY
DEPLOYMENT_VERSION_TVOS "12.2"
DEPLOYMENT_VERSION_WATCHOS "5.2"
DEPLOYMENT_VERSION_XROS "1.0"
DEPLOYMENT_VERSION_MACCATALYST "13.1"

MACCATALYST_BUILD_FLAVOR "zippered"

Expand Down