bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

make MCP510 behavior explicitly opt-in

Browse source 
because sometimes users can't opt out
This commit is contained in:
Rémy Rakic 2023-07-12 20:17:10 +00:00
parent 993deaa0bf
commit 2b61a5e17a
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -2970,10 +2970,25 @@ fn add_lld_args(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) {
return; return;
} }
let self_contained_linker = sess.opts.cg.link_self_contained.linker();
// FIXME: some targets default to using `lld`, but users can only override the linker on the CLI
// and cannot yet select the precise linker flavor to opt out of that. See for example issue
// #113597 for the `thumbv6m-none-eabi` target: a driver is used, and its default linker
// conflicts with the target's flavor, causing unexpected arguments being passed.
//
// Until the new `LinkerFlavor`-like CLI options are stabilized, we only adopt MCP510's behavior
// if its dedicated unstable CLI flags are used, to keep the current sub-optimal stable
// behavior.
let using_mcp510 =
self_contained_linker || sess.opts.cg.linker_flavor.is_some_and(|f| f.is_unstable());
if !using_mcp510 && !unstable_use_lld {
return;
}
// 1. Implement the "self-contained" part of this feature by adding rustc distribution // 1. Implement the "self-contained" part of this feature by adding rustc distribution
// directories to the tool's search path. // directories to the tool's search path.
let self_contained_linker = sess.opts.cg.link_self_contained.linker() || unstable_use_lld; if self_contained_linker || unstable_use_lld {
if self_contained_linker {
for path in sess.get_tools_search_paths(false) { for path in sess.get_tools_search_paths(false) {
cmd.arg({ cmd.arg({
let mut arg = OsString::from("-B"); let mut arg = OsString::from("-B");