Skip to content

Fixes bootstrapping with custom cargo/rustc. - #42785

Merged
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:fix-verbose-bootstrap
Jun 22, 2017
Merged

Fixes bootstrapping with custom cargo/rustc.#42785
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:fix-verbose-bootstrap

Conversation

@Mark-Simulacrum

Copy link
Copy Markdown
Member

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

config.mk is now always read when parsing the configuration to prevent
this from reoccurring in the future, hopefully.
@brsonbrson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 21, 2017
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jun 21, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 4caa0b0 has been approved by alexcrichton

@alexcrichtonalexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 21, 2017
@infinity0

Copy link
Copy Markdown
Contributor

Thanks, this together with #42695 backported to 1.18 fixes #42543 over here on Debian.

@kyrias

Copy link
Copy Markdown
Contributor

Affirmative, the patches fixes the problem for me as well.

@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

@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.
Fixesrust-lang#42543.
r? @alexcrichton
cc @infinity0@kyrias
@frewsxcvfrewsxcv mentioned this pull request Jun 22, 2017
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.
Fixesrust-lang#42543.
r? @alexcrichton
cc @infinity0@kyrias
@frewsxcvfrewsxcv mentioned this pull request Jun 22, 2017
@bors

bors commented Jun 22, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 4caa0b0 with merge efdf55d...

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
@bors

bors commented Jun 22, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing efdf55d to master...

@bors
bors merged commit 4caa0b0 into rust-lang:masterJun 22, 2017
@brsonbrson mentioned this pull request Jun 22, 2017
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 22, 2017
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
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Jun 27, 2017
bors added a commit that referenced this pull request Jun 27, 2017
[beta] backports
Reopening #42841 as a new PR due to bors flakiness.
- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566
I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
bors added a commit that referenced this pull request Jun 27, 2017
[beta] backports
Reopening #42841 as a new PR due to bors flakiness.
- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566
I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
@Mark-Simulacrum
Mark-Simulacrum deleted the fix-verbose-bootstrap branch June 8, 2019 13:48
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Mark-Simulacrum@alexcrichton@bors@infinity0@kyrias@brson