Fix the broken test

rust-lang · Aug 24, 2023 · f791293 · f791293
1 parent 7c01a5b
commit f791293
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/cargo/core/compiler/compilation.rs b/src/cargo/core/compiler/compilation.rs
@@ -458,13 +458,13 @@ fn target_runner(
 
 /// Gets the user-specified linker for a particular host or target from the configuration.
 fn target_linker(bcx: &BuildContext<'_, '_>, kind: CompileKind) -> CargoResult<Option<PathBuf>> {
-    let target = bcx.target_data.short_name(&kind);
-
-    // try target.{}.runner
-    let key = format!("target.{}.linker", target);
-
-    if let Some(v) = bcx.config.get::<Option<config::ConfigRelativePath>>(&key)? {
-        let path = v.resolve_program(bcx.config);
+    if let Some(path) = bcx
+        .target_data
+        .target_config(kind)
+        .linker
+        .as_ref()
+        .map(|l| l.val.clone().resolve_program(bcx.config))
+    {
         return Ok(Some(path));
     }
 

diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs
@@ -393,7 +393,6 @@ fn cfg_ignored_fields() {
 [WARNING] unused key `ar` in [target] config table `cfg(not(target_os = \"none\"))`
 [WARNING] unused key `foo` in [target] config table `cfg(not(target_os = \"none\"))`
 [WARNING] unused key `invalid` in [target] config table `cfg(not(target_os = \"none\"))`
-[WARNING] unused key `linker` in [target] config table `cfg(not(target_os = \"none\"))`
 [CHECKING] foo v0.0.1 ([..])
 [FINISHED] [..]
 ",