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

fix: prefer env variables over config files #2365

Merged
merged 1 commit into from
Feb 12, 2016

Conversation

japaric
Copy link
Member

@japaric japaric commented Feb 6, 2016

This patches fixes the precedence in these cases:

  • CARGO_TARGET_ROOT is now preferred over build.target-dir
  • RUSTC is now preferred over build.rustc
  • RUSTDOC is now preferred over build.rustdoc

r? @alexcrichton

This patches fixes the precedence in these cases:

- CARGO_TARGET_ROOT is now preferred over build.target-dir
- RUSTC is now preferred over build.rustc
- RUSTDOC is now preferred over build.rustdoc
@alexcrichton
Copy link
Member

This matches what I would expect, not sure why I implemented it the way it is...

cc @wycats, @brson, thoughts?

@brson
Copy link
Contributor

brson commented Feb 11, 2016

lgtm

@alexcrichton
Copy link
Member

@bors: r+ 256d9dd

@bors
Copy link
Collaborator

bors commented Feb 12, 2016

⌛ Testing commit 256d9dd with merge 24ab9e9...

bors added a commit that referenced this pull request Feb 12, 2016
This patches fixes the precedence in these cases:

- CARGO_TARGET_ROOT is now preferred over build.target-dir
- RUSTC is now preferred over build.rustc
- RUSTDOC is now preferred over build.rustdoc

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Feb 12, 2016

@bors bors merged commit 256d9dd into rust-lang:master Feb 12, 2016
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.

4 participants