Restrict the link-arg key to rustc-cdylib-link-arg for now

lu-zero · lu-zero · commit 9741016e24cb · 2019-03-08T19:36:36.000Z
diff --git a/src/cargo/core/compiler/build_context/mod.rs b/src/cargo/core/compiler/build_context/mod.rs
@@ -259,7 +259,7 @@ impl TargetConfig {
                             .library_paths
                             .extend(list.iter().map(|v| PathBuf::from(&v.0)));
                     }
-                    "rustc-link-arg" => {
+                    "rustc-cdylib-link-arg" => {
                         let args = value.list(k)?;
                         output
                             .linker_args
diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs
@@ -487,7 +487,7 @@ impl BuildOutput {
                 }
                 "rustc-link-lib" => library_links.push(value.to_string()),
                 "rustc-link-search" => library_paths.push(PathBuf::from(value)),
-                "rustc-link-arg" => linker_args.push(value.to_string()),
+                "rustc-cdylib-link-arg" => linker_args.push(value.to_string()),
                 "rustc-cfg" => cfgs.push(value.to_string()),
                 "rustc-env" => env.push(BuildOutput::parse_rustc_env(&value, &whence)?),
                 "warning" => warnings.push(value.to_string()),

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ impl TargetConfig {`
`259`	`259`	`.library_paths`
`260`	`260`	`.extend(list.iter().map(\|v\| PathBuf::from(&v.0)));`
`261`	`261`	`}`
`262`		`- "rustc-link-arg" => {`
	`262`	`+ "rustc-cdylib-link-arg" => {`
`263`	`263`	`let args = value.list(k)?;`
`264`	`264`	`output`
`265`	`265`	`.linker_args`
Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ impl BuildOutput {`
`487`	`487`	`}`
`488`	`488`	`"rustc-link-lib" => library_links.push(value.to_string()),`
`489`	`489`	`"rustc-link-search" => library_paths.push(PathBuf::from(value)),`
`490`		`- "rustc-link-arg" => linker_args.push(value.to_string()),`
	`490`	`+ "rustc-cdylib-link-arg" => linker_args.push(value.to_string()),`
`491`	`491`	`"rustc-cfg" => cfgs.push(value.to_string()),`
`492`	`492`	`"rustc-env" => env.push(BuildOutput::parse_rustc_env(&value, &whence)?),`
`493`	`493`	`"warning" => warnings.push(value.to_string()),`