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

bootstrap: prefer using '--config' over 'RUST_BOOTSTRAP_CONFIG' #93737

Merged
merged 1 commit into from
Feb 7, 2022

Conversation

mfrw
Copy link
Contributor

@mfrw mfrw commented Feb 7, 2022

Signed-off-by: Muhammad Falak R Wani falakreyaz@gmail.com

Closes: #93725
Rleated: #92260

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 7, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

Thank you!

@bors
Copy link
Contributor

bors commented Feb 7, 2022

📌 Commit 95054de 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 Feb 7, 2022
@jyn514
Copy link
Member

jyn514 commented Feb 7, 2022

err hmm this will require a follow-up PR to change the same logic in rustbuild once #92260 lands I think

@mfrw
Copy link
Contributor Author

mfrw commented Feb 7, 2022

err hmm this will require a follow-up PR to change the same logic in rustbuild once #92260 lands I think

Sure, if you could please give some hints around what would be required. I would love to work on it.
Thank You

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 7, 2022
Rollup of 13 pull requests

Successful merges:

 - rust-lang#88313 (Make the pre-commit script pre-push instead)
 - rust-lang#91530 (Suggest 1-tuple parentheses on exprs without existing parens)
 - rust-lang#92724 (Cleanup c_str.rs)
 - rust-lang#93208 (Impl {Add,Sub,Mul,Div,Rem,BitXor,BitOr,BitAnd}Assign<$t> for Wrapping<$t> for rust 1.60.0)
 - rust-lang#93394 (Don't allow {} to refer to implicit captures in format_args.)
 - rust-lang#93416 (remove `allow_fail` test flag)
 - rust-lang#93487 (Fix linking stage1 toolchain in `./x.py setup`)
 - rust-lang#93673 (Linkify sidebar headings for sibling items)
 - rust-lang#93680 (Drop json::from_reader)
 - rust-lang#93682 (Update tracking issue for `const_fn_trait_bound`)
 - rust-lang#93722 (Use shallow clones for submodules managed by rustbuild, not just bootstrap.py)
 - rust-lang#93723 (Rerun bootstrap's build script when RUSTC changes)
 - rust-lang#93737 (bootstrap: prefer using '--config' over 'RUST_BOOTSTRAP_CONFIG')

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a6c4810 into rust-lang:master Feb 7, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 7, 2022
@mfrw mfrw deleted the mfrw/bootstrap-config branch February 11, 2022 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

consider giving precedence to --config over RUST_BOOTSTRAP_CONFIG
6 participants