Skip to content

[build-script] Respect TOOLCHAINS environment variable (5.0 branch) #14285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 31, 2018
Merged

[build-script] Respect TOOLCHAINS environment variable (5.0 branch) #14285

merged 1 commit into from
Jan 31, 2018

Conversation

Rostepher
Copy link
Contributor

This is a duplicate of #14202 for the 5.0 branch.

rdar://24795244
rdar://23397534

@Rostepher
[build-script] Respect TOOLCHAINS environment variable (swiftlang#14202)
c083a29 
* 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 Rostepher added bug A deviation from expected or documented behavior. Also: expected but undesirable behavior. enhancement labels Jan 30, 2018
@Rostepher Rostepher self-assigned this Jan 30, 2018
@Rostepher
Copy link
Contributor Author

@swift-ci please test

@Rostepher
Copy link
Contributor Author

@swift-ci please build toolchain

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - c083a29

Install command
tar zxf swift-PR-14285-6-ubuntu16.04.tar.gz
More info

@Rostepher
Copy link
Contributor Author

@swift-ci please build toolchain

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - c083a29

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - c083a29

Install command
tar zxf swift-PR-14285-7-ubuntu16.04.tar.gz
More info

@Rostepher
Copy link
Contributor Author

I'm going to merge this, the failing macOS tests are PlaygroundLogger and seemingly unrelated to this change. There's other PR testing runs on the CI that are failing for the same issue.

@Rostepher Rostepher merged commit ea92fb7 into swiftlang:swift-5.0-branch Jan 31, 2018
@Rostepher Rostepher deleted the respect-thy-toolchain-5.0 branch January 31, 2018 00:43
@AnthonyLatsis AnthonyLatsis added build-script Area → utils: The build script bug fix improvement and removed bug A deviation from expected or documented behavior. Also: expected but undesirable behavior. enhancement labels Nov 13, 2022
@AnthonyLatsis AnthonyLatsis added bug A deviation from expected or documented behavior. Also: expected but undesirable behavior. and removed bug fix labels Apr 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Rostepher Rostepher

Labels
bug A deviation from expected or documented behavior. Also: expected but undesirable behavior. build-script Area → utils: The build script improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Rostepher @swift-ci @AnthonyLatsis