[build-script] Set the TOOLCHAINS variable in the environment. #8419
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
On Darwin platforms, the Swift build scripts generally use "xcrun" to locate various tools, and the build-script's darwin-xcrun-toolchain option is specified to xcrun. However, with the change to use the just-built clang to build the runtime (PR swiftlang#6112), there was an issue with the linker. Clang normally tries to run the linker from the same directory as the clang binary, but when there isn't one, it falls back on /usr/bin/ld, which is just an xcrun-like wrapper. Since there is no way to specify an explicit toolchain option in that case, set TOOLCHAINS in the environment to make it use the linker from the specified toolchain. rdar://problem/30709330
|
@swift-ci please smoke test and merge |
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.
Set TOOLCHAINS in the environment so that we use the linker from the toolchain specified by the build-script's darwin-xcrun-toolchain option.