Accept rustc-link-arg-cdylib in addition to rustc-cdylib-link-arg.

Author: reitermarkus

src/cargo/core/compiler/custom_build.rs

@@ -546,7 +546,9 @@ impl BuildOutput {
                 }
                 "rustc-link-lib" => library_links.push(value.to_string()),
                 "rustc-link-search" => library_paths.push(PathBuf::from(value)),
-                "rustc-cdylib-link-arg" => linker_args.push((Some(LinkType::Cdylib), value)),
+                "rustc-link-arg-cdylib" | "rustc-cdylib-link-arg" => {
+                    linker_args.push((Some(LinkType::Cdylib), value))
+                }
                 "rustc-link-arg-bins" => {
                     if extra_link_arg {
                         linker_args.push((Some(LinkType::Bin), value));

src/cargo/util/config/target.rs

@@ -132,7 +132,7 @@ fn parse_links_overrides(
                         .library_paths
                         .extend(list.iter().map(|v| PathBuf::from(&v.0)));
                 }
-                "rustc-cdylib-link-arg" => {
+                "rustc-link-arg-cdylib" | "rustc-cdylib-link-arg" => {
                     let args = value.list(key)?;
                     let args = args.iter().map(|v| (Some(LinkType::Cdylib), v.0.clone()));
                     output.linker_args.extend(args);