Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 1d83913

Browse files
Auto merge of #142257 - wesleywiser:test_v0_symbol_mangling, r=<try>
[Experiment] Build the standard library with -Csymbol-mangling-version=v0 r? ghost
2 parents 00b5262 + a285550 commit 1d83913

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

‎src/bootstrap/src/core/builder/cargo.rs

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -578,22 +578,6 @@ impl Builder<'_> {
578578
rustflags.arg(sysroot_str);
579579
}
580580

581-
let use_new_symbol_mangling = match self.config.rust_new_symbol_mangling {
582-
Some(setting) => {
583-
// If an explicit setting is given, use that
584-
setting
585-
}
586-
None => {
587-
if mode == Mode::Std {
588-
// The standard library defaults to the legacy scheme
589-
false
590-
} else {
591-
// The compiler and tools default to the new scheme
592-
true
593-
}
594-
}
595-
};
596-
597581
// By default, windows-rs depends on a native library that doesn't get copied into the
598582
// sysroot. Passing this cfg enables raw-dylib support instead, which makes the native
599583
// library unnecessary. This can be removed when windows-rs enables raw-dylib
@@ -602,11 +586,7 @@ impl Builder<'_> {
602586
rustflags.arg("--cfg=windows_raw_dylib");
603587
}
604588

605-
if use_new_symbol_mangling {
606-
rustflags.arg("-Csymbol-mangling-version=v0");
607-
} else {
608-
rustflags.arg("-Csymbol-mangling-version=legacy");
609-
}
589+
rustflags.arg("-Csymbol-mangling-version=v0");
610590

611591
// FIXME: the following components don't build with `-Zrandomize-layout` yet:
612592
// - rust-analyzer, due to the rowan crate

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /