diff options
| author | bors <bors@rust-lang.org> | 2023-07-22 18:49:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-22 18:49:42 +0000 |
| commit | a6fbd1c58d2247d95aa5efa7b4ac5c846fcd5312 (patch) | |
| tree | acbb37a092fe7eb4b5f6b4b4d04feed0b022e431 /src | |
| parent | c39995485f57083873682ff4032ea1ebb8f51ae9 (diff) | |
| parent | 52153432a86cb938110c88233cfdf7a7acca1230 (diff) | |
| download | rust-a6fbd1c58d2247d95aa5efa7b4ac5c846fcd5312.tar.gz rust-a6fbd1c58d2247d95aa5efa7b4ac5c846fcd5312.zip | |
Auto merge of #113968 - matthiaskrgr:rollup-7vdfcba, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #112508 (Tweak spans for self arg, fix borrow suggestion for signature mismatch) - #113901 (Get rid of subst-relate incompleteness in new solver) - #113948 (Fix rustc-args passing issue in bootstrap) - #113950 (Remove Scope::Elision from bound-vars resolution.) - #113957 (Add regression test for issue #113941 - naive layout isn't refined) - #113959 (Migrate GUI colors test to original CSS color format) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/builder.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 32eb4e68b08..1707dafb11a 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -2043,6 +2043,13 @@ impl<'a> Builder<'a> { rustflags.arg("-Zinline-mir"); } + // set rustc args passed from command line + let rustc_args = + self.config.cmd.rustc_args().iter().map(|s| s.to_string()).collect::<Vec<_>>(); + if !rustc_args.is_empty() { + cargo.env("RUSTFLAGS", &rustc_args.join(" ")); + } + Cargo { command: cargo, rustflags, rustdocflags, allow_features } } |
