diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2022-01-03 12:33:26 +0100 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-01-04 12:06:46 -0500 |
| commit | e266cb90defc63c574c1fccaccdea0cb8133557f (patch) | |
| tree | 61e6294759e2d236dd90ce686f284c8a1b17d0ce | |
| parent | 2b681ac06b1a6b7ea39525e59363ffee0d1a68e5 (diff) | |
| download | rust-e266cb90defc63c574c1fccaccdea0cb8133557f.tar.gz rust-e266cb90defc63c574c1fccaccdea0cb8133557f.zip | |
Do not use deprecated -Zsymbol-mangling-version in bootstrap
| -rw-r--r-- | src/bootstrap/builder.rs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 917abde9de1..6ccf8b1d522 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -988,10 +988,20 @@ impl<'a> Builder<'a> { } }; - if use_new_symbol_mangling { - rustflags.arg("-Zsymbol-mangling-version=v0"); + // 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"); + } } else { - rustflags.arg("-Zsymbol-mangling-version=legacy"); + if use_new_symbol_mangling { + rustflags.arg("-Csymbol-mangling-version=v0"); + } else { + 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`, |