[5.5] Respect SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGET when set (such as during Swift toolchain build)
#224
+12
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…h as during Swift toolchain build) (#220) If it is not set in the environment, stay with the default minimum deployment target of 10.10 on macOS. This aligns with both swift-package-manager and with swift-driver, and is important now that ToolSupportCore has started containing some code that is annotated with availability for Darwin platforms. It uses the more project-neutral name `SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGET` and the expectation is that both SwiftPM and SwiftDriver will switch to using it as well. (cherry picked from commit 21a7918)
abertelrud
requested review from
aciidgh,
friedbunny,
neonichu and
tomerd
as code owners
|
@swift-ci please test |
tomerd
approved these changes
Jun 14, 2021
tomerd
reviewed
Jun 14, 2021
| import class Foundation.ProcessInfo | ||
|
|
||
| let macOSPlatform: SupportedPlatform | ||
| if let deploymentTarget = ProcessInfo.processInfo.environment["SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGET"] { |
There was a problem hiding this comment.
@abertelrud are we also changing SwiftPM to use this instead?
There was a problem hiding this comment.
Yes, that's the plan, although this needs to be coordinated with @shahmishal. But I can put up a SwiftPM and SwiftDriver change to favour SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGET and for now falling back on SWIFTPM_MACOS_DEPLOYMENT_TARGET until the new one is set in toolchain builds.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the Swift 5.5 nomination of fixes for @available() annotations merged to mainline in #220.
(cherry picked from commit 21a7918)