Fixes bootstrapping with custom cargo/rustc. #42785
Merged
Conversation
This file contains 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
config.mk is now always read when parsing the configuration to prevent this from reoccurring in the future, hopefully.
brson
added
the
beta-nominated
|
@bors: r+ |
|
📌 Commit 4caa0b0 has been approved by |
alexcrichton
added
the
beta-accepted
|
Affirmative, the patches fixes the problem for me as well. |
|
@bors rollup |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Jun 22, 2017
…ap, r=alexcrichton Fixes bootstrapping with custom cargo/rustc. config.mk is now always read when parsing the configuration to prevent this from reoccurring in the future, hopefully. Fixes rust-lang#42543. r? @alexcrichton cc @infinity0 @kyrias
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Jun 22, 2017
…ap, r=alexcrichton Fixes bootstrapping with custom cargo/rustc. config.mk is now always read when parsing the configuration to prevent this from reoccurring in the future, hopefully. Fixes rust-lang#42543. r? @alexcrichton cc @infinity0 @kyrias
bors
added a commit
that referenced
this pull request
Jun 22, 2017
…richton Fixes bootstrapping with custom cargo/rustc. config.mk is now always read when parsing the configuration to prevent this from reoccurring in the future, hopefully. Fixes #42543. r? @alexcrichton cc @infinity0 @kyrias
|
☀️ Test successful - status-appveyor, status-travis |
Closed
alexcrichton
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Jun 25, 2017
[beta] backports - #42785 - #42740 - #42735 - #42728 - #42695 - #42659 - #42634 - #42566 I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly. Still testing locally. cc @rust-lang/compiler r? @alexcrichton
bors
added a commit
that referenced
this pull request
Jun 25, 2017
[beta] backports - #42785 - #42740 - #42735 - #42728 - #42695 - #42659 - #42634 - #42566 I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly. Still testing locally. cc @rust-lang/compiler r? @alexcrichton
Merged
bors
added a commit
that referenced
this pull request
Jun 27, 2017
bors
added a commit
that referenced
this pull request
Jun 27, 2017
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
config.mk is now always read when parsing the configuration to prevent
this from reoccurring in the future, hopefully.
Fixes #42543.
r? @alexcrichton
cc @infinity0 @kyrias