[build-script] Respect TOOLCHAINS environment variable #14202
Merged
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
|
@swift-ci please test |
Rostepher
added
bug
…darwin xcrun toolchain.
Rostepher
force-pushed
the
respect-thy-toolchain
branch
from
e3bb111 to
dadb2bc
Compare
…hen deciding the xcrun toolchain for Darwin platforms, rather than hardcoding the default.
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
@swift-ci build toolchain |
|
@Rostepher Sorry! I hit the wrong button. |
|
@swift-ci build toolchain |
|
Linux Toolchain (Ubuntu 16.04) Install command |
|
macOS Toolchain Install command |
Rostepher
added a commit
to Rostepher/swift
that referenced
this pull request
Jan 30, 2018
* Respect the TOOLCHAINS environment variable if set when deciding the darwin xcrun toolchain. * Updated test/lit.cfg to respect the TOOLCHAINS environment variable when deciding the xcrun toolchain for Darwin platforms, rather than hardcoding the default. * Fixed the default darwin xcrun toolchain logic. (cherry picked from commit a436044)
Rostepher
added a commit
that referenced
this pull request
Jan 31, 2018
* Respect the TOOLCHAINS environment variable if set when deciding the darwin xcrun toolchain. * Updated test/lit.cfg to respect the TOOLCHAINS environment variable when deciding the xcrun toolchain for Darwin platforms, rather than hardcoding the default. * Fixed the default darwin xcrun toolchain logic. (cherry picked from commit a436044)
AnthonyLatsis
added
bug fix
improvement
and removed
bug
AnthonyLatsis
added
bug
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.
Purpose
This PR modifies
build-scriptto respect the environment variableTOOLCHAINS. If the--darwin-xcrun-toolchainflag is used then the environment variable will be ignored in favor of the explicit command line option.I've also fixed the hardcoded toolchain in
test/lit.cfg, which explicitly overwrites theTOOLCHAINSenvironment variable withdefaultrather than passing theconfig.darwin_xcrun_toolchainor examining the system environment.rdar://24795244
rdar://23397534