diff options
| author | Michael Goulet <michael@errs.io> | 2023-04-11 20:28:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 20:28:47 -0700 |
| commit | e6e46bae6f843eee8f3fa236b2d1b26a6ed5f40a (patch) | |
| tree | 05f947569f2189abac3a67529379bd6fdfa6de50 /src/bootstrap | |
| parent | 90b55973ddaa71546a225c890ad52ae2603a745d (diff) | |
| parent | 7944930b0908cecfd58a47ca2b7b2b42136ada14 (diff) | |
| download | rust-e6e46bae6f843eee8f3fa236b2d1b26a6ed5f40a.tar.gz rust-e6e46bae6f843eee8f3fa236b2d1b26a6ed5f40a.zip | |
Rollup merge of #110018 - jfgoog:host-and-target-linker, r=wesleywiser
Pass host linker to compiletest. Tests marked `// force-host` were using the default linker, even if a custom linker was configured in config.toml. This change adds a new flag, --host-linker, to compiletest, and renames --linker to --target-linker.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 058ff429e80..f9c5837b7d6 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1535,7 +1535,10 @@ note: if you're sure you want to do this, please open an issue as to why. In the flags.extend(builder.config.cmd.rustc_args().iter().map(|s| s.to_string())); if let Some(linker) = builder.linker(target) { - cmd.arg("--linker").arg(linker); + cmd.arg("--target-linker").arg(linker); + } + if let Some(linker) = builder.linker(compiler.host) { + cmd.arg("--host-linker").arg(linker); } let mut hostflags = flags.clone(); |
