Skip to content
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.

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

Support configuration of what compiler to run #1629

Merged
merged 3 commits into from
May 19, 2015

Conversation

alexcrichton
Copy link
Member

These commits add two vectors through which the compiler run can be configured:

  • A RUSTC environment variable
  • A build.rustc configuration variable in a .cargo/config file

Not having a lifetime parameter on the ubiquitous Config structure allows a
great deal of other lifetime annotations to be removed and should make dealing
with storage of Config in a structure much easier (only one lifetime to deal
with, not two).
@alexcrichton
Copy link
Member Author

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned huonw May 18, 2015
@rust-highfive
Copy link

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor

brson commented May 19, 2015

@bors r+

@bors
Copy link
Contributor

bors commented May 19, 2015

📌 Commit 9afa4c1 has been approved by brson

@bors
Copy link
Contributor

bors commented May 19, 2015

⌛ Testing commit 9afa4c1 with merge 7395317...

@bors
Copy link
Contributor

bors commented May 19, 2015

💔 Test failed - cargo-linux-32

@alexcrichton
Copy link
Member Author

@bors: retry

On Mon, May 18, 2015 at 5:15 PM, bors [email protected] wrote:

[image: 💔] Test failed - cargo-linux-32
http://buildbot.rust-lang.org/builders/cargo-linux-32/builds/1125


Reply to this email directly or view it on GitHub
#1629 (comment).

@bors
Copy link
Contributor

bors commented May 19, 2015

⚡ Previous build results for cargo-linux-64, cargo-mac-32, cargo-mac-64 are reusable. Rebuilding only cargo-linux-32, cargo-win-32, cargo-win-64...

@bors
Copy link
Contributor

bors commented May 19, 2015

💔 Test failed - cargo-win-32

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented May 19, 2015

📌 Commit 97f9b51 has been approved by brson

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented May 19, 2015

📌 Commit 3144125 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented May 19, 2015

⌛ Testing commit 3144125 with merge 61a59f8...

@bors
Copy link
Contributor

bors commented May 19, 2015

💔 Test failed - cargo-linux-64

In addition to global RUSTC/RUSTDOC env vars, this commit recognizes
`build.rustc` and `build.rustdoc` as configuration keys for Cargo to instruct
what tools should be used instead of the default.

Closes rust-lang#967
@alexcrichton
Copy link
Member Author

@bors: r+ 8a8ea1e

@bors
Copy link
Contributor

bors commented May 19, 2015

⌛ Testing commit 8a8ea1e with merge a1778ef...

bors added a commit that referenced this pull request May 19, 2015
These commits add two vectors through which the compiler run can be configured:

* A `RUSTC` environment variable
* A `build.rustc` configuration variable in a `.cargo/config` file
@bors
Copy link
Contributor

bors commented May 19, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32, cargo-win-64

@bors bors merged commit 8a8ea1e into rust-lang:master May 19, 2015
@alexcrichton alexcrichton deleted the env-rustc branch May 19, 2015 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants