Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

extra-link-arg: support all link types #9416

Closed
wants to merge 1 commit into from
Closed

extra-link-arg: support all link types #9416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/cargo/core/compiler/custom_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,27 @@ impl BuildOutput {
warnings.push(format!("cargo:{} requires -Zextra-link-arg flag", key));
}
}
"rustc-link-arg-tests" => {
if extra_link_arg {
linker_args.push((Some(LinkType::Test), value));
} else {
warnings.push(format!("cargo:{} requires -Zextra-link-arg flag", key));
}
}
"rustc-link-arg-benches" => {
if extra_link_arg {
linker_args.push((Some(LinkType::Bench), value));
} else {
warnings.push(format!("cargo:{} requires -Zextra-link-arg flag", key));
}
}
"rustc-link-arg-examples" => {
if extra_link_arg {
linker_args.push((Some(LinkType::Example), value));
} else {
warnings.push(format!("cargo:{} requires -Zextra-link-arg flag", key));
}
}
"rustc-link-arg" => {
if extra_link_arg {
linker_args.push((None, value));
Expand Down
62 changes: 47 additions & 15 deletions src/cargo/util/config/target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,32 +133,48 @@ fn parse_links_overrides(
.extend(list.iter().map(|v| PathBuf::from(&v.0)));
}
"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()));
let args = extra_link_args(Some(LinkType::Cdylib), key, value)?;
output.linker_args.extend(args);
}
"rustc-link-arg-bins" => {
if extra_link_arg {
let args = value.list(key)?;
let args = args.iter().map(|v| (Some(LinkType::Bin), v.0.clone()));
let args = extra_link_args(Some(LinkType::Bin), key, value)?;
output.linker_args.extend(args);
} else {
config.shell().warn(format!(
"target config `{}.{}` requires -Zextra-link-arg flag",
target_key, key
))?;
warn_extra_link_arg(config, target_key, key)?;
}
}
"rustc-link-arg" => {
"rustc-link-arg-tests" => {
if extra_link_arg {
let args = extra_link_args(Some(LinkType::Test), key, value)?;
output.linker_args.extend(args);
} else {
warn_extra_link_arg(config, target_key, key)?;
}
}
"rustc-link-arg-benches" => {
if extra_link_arg {
let args = extra_link_args(Some(LinkType::Bench), key, value)?;
output.linker_args.extend(args);
} else {
warn_extra_link_arg(config, target_key, key)?;
}
}
"rustc-link-arg-examples" => {
if extra_link_arg {
let args = value.list(key)?;
let args = args.iter().map(|v| (None, v.0.clone()));
let args = extra_link_args(Some(LinkType::Example), key, value)?;
output.linker_args.extend(args);
} else {
config.shell().warn(format!(
"target config `{}.{}` requires -Zextra-link-arg flag",
target_key, key
))?;
warn_extra_link_arg(config, target_key, key)?;
}
}
"rustc-link-arg" => {
if extra_link_arg {
output
.linker_args
.extend(extra_link_args(None, key, value)?);
} else {
warn_extra_link_arg(config, target_key, key)?;
}
}
"rustc-cfg" => {
Expand All @@ -184,3 +200,19 @@ fn parse_links_overrides(
}
Ok(links_overrides)
}

fn extra_link_args<'a>(
link_type: Option<LinkType>,
key: &str,
value: &'a CV,
) -> CargoResult<impl Iterator<Item = (Option<LinkType>, String)> + 'a> {
let args = value.list(key)?;
Ok(args.iter().map(move |v| (link_type, v.0.clone())))
}

fn warn_extra_link_arg(config: &Config, target_key: &ConfigKey, key: &str) -> CargoResult<()> {
config.shell().warn(format!(
"target config `{}.{}` requires -Zextra-link-arg flag",
target_key, key
))
}
79 changes: 77 additions & 2 deletions tests/testsuite/build_script_extra_link_arg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//! Tests for -Zextra-link-arg.

use cargo_test_support::{basic_bin_manifest, project};
use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, project};

#[cargo_test]
fn build_script_extra_link_arg_bin() {
fn build_script_extra_link_arg_bins() {
let p = project()
.file("Cargo.toml", &basic_bin_manifest("foo"))
.file("src/main.rs", "fn main() {}")
Expand All @@ -26,6 +26,81 @@ fn build_script_extra_link_arg_bin() {
.run();
}

#[cargo_test]
fn build_script_extra_link_arg_tests() {
let p = project()
.file("Cargo.toml", &basic_lib_manifest("foo"))
.file("src/lib.rs", "")
.file("tests/test_foo.rs", "")
.file(
"build.rs",
r#"
fn main() {
println!("cargo:rustc-link-arg-tests=--this-is-a-bogus-flag");
}
"#,
)
.build();

p.cargo("test -Zextra-link-arg -v")
.masquerade_as_nightly_cargo()
.without_status()
.with_stderr_contains(
"[RUNNING] `rustc --crate-name test_foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
)
.run();
}

#[cargo_test]
fn build_script_extra_link_arg_benches() {
let p = project()
.file("Cargo.toml", &basic_lib_manifest("foo"))
.file("src/lib.rs", "")
.file("benches/bench_foo.rs", "")
.file(
"build.rs",
r#"
fn main() {
println!("cargo:rustc-link-arg-benches=--this-is-a-bogus-flag");
}
"#,
)
.build();

p.cargo("bench -Zextra-link-arg -v")
.masquerade_as_nightly_cargo()
.without_status()
.with_stderr_contains(
"[RUNNING] `rustc --crate-name bench_foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
)
.run();
}

#[cargo_test]
fn build_script_extra_link_arg_examples() {
let p = project()
.file("Cargo.toml", &basic_lib_manifest("foo"))
.file("src/lib.rs", "")
.file("examples/example_foo.rs", "fn main() {}")
.file(
"build.rs",
r#"
fn main() {
println!("cargo:rustc-link-arg-examples=--this-is-a-bogus-flag");
}
"#,
)
.build();

p.cargo("build -Zextra-link-arg -v --examples")
.masquerade_as_nightly_cargo()
.without_status()
.with_stderr_contains(
"[RUNNING] `rustc --crate-name example_foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
)
.run();
}

#[cargo_test]
fn build_script_extra_link_arg() {
let p = project()
Expand Down