Respect SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGET if it is set in the environment
#3552
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
…or a while still respect SWIFTPM_MACOS_DEPLOYMENT_TARGET as fallback)
abertelrud
added
the
ready
|
@swift-ci please smoke test |
tomerd
approved these changes
Jun 15, 2021
|
I think we can just get rid of the variable at this point, since the fallback is 10.15 and the value that we are setting it in the This was really only meant as a temporary measure while we were still supporting 10.10 and I forgot to clean it up as we moved to 10.15 by default. |
Sounds good. Opened #3557 and will close this one. |
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 makes the SwiftPM manifest respect
SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGETin preference over the existingSWIFTPM_MACOS_DEPLOYMENT_TARGET, which is still used as fallback.Motivation:
Rather than having every unrelated package use
SWIFTPM_MACOS_DEPLOYMENT_TARGET, we have started to use the more neutralSWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGET(see for example swiftlang/swift-tools-support-core#220) so that one setting can control all the packages that make up the toolchain.Modifications:
SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGETResult:
SWIFT_TOOLCHAIN_MACOS_DEPLOYMENT_TARGETwill be respected if it is set, otherwiseSWIFTPM_MACOS_DEPLOYMENT_TARGETwill be respected, otherwise the default is used.