Make utils/build-toolchain compatible with Xcode new build system. #29025
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
Xcode's new build system requires the Version entry in Info.plist to have a particular date-based format. Toolchains built using utils/build-toolchain now work with Xcode's new build system.
dan-zheng
commented
Jan 6, 2020
| @@ -98,15 +98,15 @@ set -x | |||
| YEAR=$(date +"%Y") | |||
| MONTH=$(date +"%m") | |||
| DAY=$(date +"%d") | |||
| TOOLCHAIN_VERSION="swift-LOCAL-${YEAR}-${MONTH}-${DAY}-a" | |||
| TOOLCHAIN_VERSION="5.0.${YEAR}${MONTH}${DAY}" | |||
There was a problem hiding this comment.
Note: the toolchain version format was copied from Info.plist from macOS toolchains from https://swift.org/download.
The leading 5.0 component appears to refer to the current Swift version (which incidentally is no longer 5.0 for master HEAD).
I'm not sure how to make it programmatically refer to the current Swift version. Hardcoding it to 5.0 seems fine for now.
There was a problem hiding this comment.
We could generate this file from CMake. There is no way to do this currently. I think that this is reasonable.
compnerd
approved these changes
Jan 6, 2020
|
|
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.
Xcode's new build system requires the Version entry in Info.plist to have a
particular date-based format.
Toolchains built using utils/build-toolchain now work with Xcode's new build
system.
Cherry-picks #28945 from
tensorflowbranch, with minor gardening.Resolves this issue when opening Xcode:
See tensorflow/swift#350 for more info about the issue.
Someone discovered this issue in
utils/build-toolchainon the forums but didn't submit a fix.