Skip to content

Commit

Permalink
Merge pull request #293 from dtolnay/targetrustflags
Browse files Browse the repository at this point in the history
Combine trybuild rustflags with target-specific rustflags
  • Loading branch information
dtolnay authored Oct 18, 2024
2 parents 1fa2fcb + e3d8dab commit fba7a15
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/cargo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use serde_derive::Deserialize;
use std::path::PathBuf;
use std::process::{Command, Output, Stdio};
use std::{env, fs, iter};
use target_triple::TARGET;

#[derive(Deserialize)]
pub(crate) struct Metadata {
Expand Down Expand Up @@ -41,7 +42,11 @@ fn cargo(project: &Project) -> Command {
cmd.env_remove("RUSTFLAGS");
cmd.env("CARGO_INCREMENTAL", "0");
cmd.arg("--offline");
cmd.arg(format!("--config=build.rustflags={}", rustflags::toml()));

let rustflags = rustflags::toml();
cmd.arg(format!("--config=build.rustflags={rustflags}"));
cmd.arg(format!("--config=target.{TARGET}.rustflags={rustflags}"));

cmd
}

Expand Down Expand Up @@ -199,6 +204,6 @@ fn target() -> Vec<&'static str> {
if cfg!(trybuild_no_target) {
vec![]
} else {
vec!["--target", target_triple::TARGET]
vec!["--target", TARGET]
}
}

0 comments on commit fba7a15

Please sign in to comment.