Skip to content

[5.9] Add flags to toolchain Info.plist to allow using macros from Apple's SDKs when building in Xcode using swift.org toolchains #66427

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.

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
Jun 8, 2023

Conversation

owenv
Copy link
Contributor

@owenv owenv commented Jun 7, 2023

5.9 cherrypick of #66365

Explanation: Adds settings overrides to the toolchain Info.plist so that when using a swift.org toolchain to build in Xcode, macros shipped with Apple SDKs can be used.
Risk: Low. Changes are restricted to the toolchain's Info.plist overriding build settings, and the flags injected are strictly additive.
Original PR: #66365
Reviewed by: @shahmishal
Resolves: rdar://109061058
Tests: Manually verified this change is a no-op in Xcode 14.3, and that in Xcode 15 beta it allows use of SDK macros while still allowing projects to add their own flags using OTHER_SWIFT_FLAGS.

@owenv owenv requested review from rintaro and shahmishal June 7, 2023 19:56
@owenv owenv requested a review from a team as a code owner June 7, 2023 19:56
@owenv owenv added 🍒 release cherry pick Flag: Release branch cherry picks swift 5.9 labels Jun 7, 2023
@owenv
Copy link
Contributor Author

owenv commented Jun 7, 2023

@swift-ci please build toolchain macOS

@owenv
Copy link
Contributor Author

owenv commented Jun 7, 2023

@swift-ci please smoke test

@rintaro
Copy link
Member

rintaro commented Jun 7, 2023

@swift-ci Please test

@owenv owenv merged commit d56ee08 into swiftlang:release/5.9 Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 5.9
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants