diff options
| author | Eric Huss <eric@huss.org> | 2022-01-30 08:37:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-30 08:37:46 -0800 |
| commit | 0610d4fa66f95fa3a4a7af86239976ed668bab0e (patch) | |
| tree | 077c6754dc195449445e9089af4f2fccd3de9667 /src/bootstrap | |
| parent | 7cc28c128be0363d83accf318b87b40ba6168384 (diff) | |
| parent | 5b3462c556932234c6bae24c6f90c55a463f23c3 (diff) | |
| download | rust-0610d4fa66f95fa3a4a7af86239976ed668bab0e.tar.gz rust-0610d4fa66f95fa3a4a7af86239976ed668bab0e.zip | |
Rollup merge of #92887 - pietroalbini:pa-bootstrap-update, r=Mark-Simulacrum
Bootstrap compiler update r? ``@Mark-Simulacrum``
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 4fe69cefe12..4f88b5854b6 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1088,20 +1088,11 @@ impl<'a> Builder<'a> { } }; - // cfg(bootstrap) -- drop the compiler.stage == 0 branch. - if compiler.stage == 0 { - if use_new_symbol_mangling { - rustflags.arg("-Zsymbol-mangling-version=v0"); - } else { - rustflags.arg("-Zsymbol-mangling-version=legacy"); - } + if use_new_symbol_mangling { + rustflags.arg("-Csymbol-mangling-version=v0"); } else { - if use_new_symbol_mangling { - rustflags.arg("-Csymbol-mangling-version=v0"); - } else { - rustflags.arg("-Csymbol-mangling-version=legacy"); - rustflags.arg("-Zunstable-options"); - } + rustflags.arg("-Csymbol-mangling-version=legacy"); + rustflags.arg("-Zunstable-options"); } // FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`, |