Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Sep 28, 2020

Previously, config.config was always hardcoded as "config.toml".
I thought that it was being overridden with the actual value later, but
it turns out flags.config was being completely discarded. This keeps
config.config in sync with flags.config.

Fixes #77293
r? @Mark-Simulacrum
cc @davidtwco

Previously, `config.config` was always hardcoded as `"config.toml"`.
I thought that it was being overridden with the actual value later, but
it turns out `flags.config` was being completely discarded. This keeps
`config.config` in sync with `flags.config`.
@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) C-bug Category: This is a bug. labels Sep 28, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 28, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 28, 2020

📌 Commit d537067 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 28, 2020
@bors
Copy link
Collaborator

bors commented Sep 30, 2020

⌛ Testing commit d537067 with merge d92d28e...

@bors
Copy link
Collaborator

bors commented Sep 30, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing d92d28e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 30, 2020
@bors bors merged commit d92d28e into rust-lang:master Sep 30, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 30, 2020
@jyn514 jyn514 deleted the bootstrap-config branch September 30, 2020 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-bug Category: This is a bug. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

warning for missing config.toml doesn't consider $RUST_BOOTSTRAP_CONFIG
5 participants