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

Only enable zig ar in cargo-zigbuild binary by default #56

Merged
merged 2 commits into from
Aug 6, 2022
Merged

Only enable zig ar in cargo-zigbuild binary by default #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d34124d
Only enable ar/ranlib in cargo-zigbuild binary
messense Aug 6, 2022
0ea148f
Use shell/batch wrapper for `zig ranlib`
messense Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions src/bin/cargo-zigbuild.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,13 @@ fn main() -> anyhow::Result<()> {
args: args.collect(),
};
zig.execute()?;
} else if program_name.eq_ignore_ascii_case("ranlib") {
let zig = Zig::Ranlib {
args: args.collect(),
};
zig.execute()?;
} else {
let opt = Opt::parse();
match opt {
Opt::Build(build) => build.execute()?,
Opt::Build(mut build) => {
build.enable_zig_ar = true;
build.execute()?
}
Opt::Metadata(metadata) => {
let mut cmd = metadata.command();
let mut child = cmd.spawn().context("Failed to run cargo metadata")?;
Expand All @@ -56,9 +54,18 @@ fn main() -> anyhow::Result<()> {
std::process::exit(status.code().unwrap_or(1));
}
}
Opt::Rustc(rustc) => rustc.execute()?,
Opt::Run(run) => run.execute()?,
Opt::Test(test) => test.execute()?,
Opt::Rustc(mut rustc) => {
rustc.enable_zig_ar = true;
rustc.execute()?
}
Opt::Run(mut run) => {
run.enable_zig_ar = true;
run.execute()?
}
Opt::Test(mut test) => {
test.enable_zig_ar = true;
test.execute()?
}
Opt::Zig(zig) => zig.execute()?,
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ pub struct Build {
/// Disable zig linker
#[clap(skip)]
pub disable_zig_linker: bool,

/// Enable zig ar
#[clap(skip)]
pub enable_zig_ar: bool,
}

impl Build {
Expand All @@ -44,7 +48,7 @@ impl Build {
pub fn build_command(&self) -> Result<Command> {
let mut build = self.cargo.command();
if !self.disable_zig_linker {
Zig::apply_command_env(&self.cargo.common, &mut build)?;
Zig::apply_command_env(&self.cargo.common, &mut build, self.enable_zig_ar)?;
}

Ok(build)
Expand All @@ -69,7 +73,7 @@ impl From<cargo_options::Build> for Build {
fn from(cargo: cargo_options::Build) -> Self {
Self {
cargo,
disable_zig_linker: false,
..Default::default()
}
}
}
6 changes: 5 additions & 1 deletion src/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ pub struct Run {
#[clap(skip)]
pub disable_zig_linker: bool,

/// Enable zig ar
#[clap(skip)]
pub enable_zig_ar: bool,

#[clap(flatten)]
pub cargo: cargo_options::Run,
}
Expand Down Expand Up @@ -48,7 +52,7 @@ impl Run {
pub fn build_command(&self) -> Result<Command> {
let mut build = self.cargo.command();
if !self.disable_zig_linker {
Zig::apply_command_env(&self.cargo.common, &mut build)?;
Zig::apply_command_env(&self.cargo.common, &mut build, self.enable_zig_ar)?;
}

Ok(build)
Expand Down
6 changes: 5 additions & 1 deletion src/rustc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ pub struct Rustc {
#[clap(skip)]
pub disable_zig_linker: bool,

/// Enable zig ar
#[clap(skip)]
pub enable_zig_ar: bool,

#[clap(flatten)]
pub cargo: cargo_options::Rustc,
}
Expand Down Expand Up @@ -49,7 +53,7 @@ impl Rustc {
pub fn build_command(&self) -> Result<Command> {
let mut build = self.cargo.command();
if !self.disable_zig_linker {
Zig::apply_command_env(&self.cargo.common, &mut build)?;
Zig::apply_command_env(&self.cargo.common, &mut build, self.enable_zig_ar)?;
}

Ok(build)
Expand Down
6 changes: 5 additions & 1 deletion src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ pub struct Test {
#[clap(skip)]
pub disable_zig_linker: bool,

/// Enable zig ar
#[clap(skip)]
pub enable_zig_ar: bool,

#[clap(flatten)]
pub cargo: cargo_options::Test,
}
Expand Down Expand Up @@ -48,7 +52,7 @@ impl Test {
pub fn build_command(&self) -> Result<Command> {
let mut build = self.cargo.command();
if !self.disable_zig_linker {
Zig::apply_command_env(&self.cargo.common, &mut build)?;
Zig::apply_command_env(&self.cargo.common, &mut build, self.enable_zig_ar)?;
}

Ok(build)
Expand Down
45 changes: 32 additions & 13 deletions src/zig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ impl Zig {
pub(crate) fn apply_command_env(
cargo: &cargo_options::CommonOptions,
cmd: &mut Command,
enable_zig_ar: bool,
) -> Result<()> {
// setup zig as linker
let rust_targets = cargo
Expand All @@ -321,26 +322,44 @@ impl Zig {
let env_target = parsed_target.replace('-', "_");
let zig_wrapper = prepare_zig_linker(raw_target)?;
if is_mingw_shell() {
let mut add_env = |name, value| {
if env::var_os(&name).is_none() {
cmd.env(name, value);
}
};
let zig_cc = zig_wrapper.cc.to_slash_lossy();
cmd.env(format!("CC_{}", env_target), &*zig_cc);
cmd.env(
format!("CXX_{}", env_target),
&*zig_wrapper.cxx.to_slash_lossy(),
);
cmd.env(
let zig_cxx = zig_wrapper.cxx.to_slash_lossy();
add_env(format!("CC_{}", env_target), &*zig_cc);
add_env(format!("CXX_{}", env_target), &*zig_cxx);
add_env(
format!("CARGO_TARGET_{}_LINKER", env_target.to_uppercase()),
&*zig_cc,
);
} else {
cmd.env(format!("CC_{}", env_target), &zig_wrapper.cc);
cmd.env(format!("CXX_{}", env_target), &zig_wrapper.cxx);
cmd.env(
let mut add_env = |name, value| {
if env::var_os(&name).is_none() {
cmd.env(name, value);
}
};
add_env(format!("CC_{}", env_target), &zig_wrapper.cc);
add_env(format!("CXX_{}", env_target), &zig_wrapper.cxx);
add_env(
format!("CARGO_TARGET_{}_LINKER", env_target.to_uppercase()),
&zig_wrapper.cc,
);
}
cmd.env(format!("AR_{}", env_target), &zig_wrapper.ar);
cmd.env(format!("RANLIB_{}", env_target), &zig_wrapper.ranlib);

let mut add_env = |name, value| {
if env::var_os(&name).is_none() {
cmd.env(name, value);
}
};
add_env(format!("RANLIB_{}", env_target), &zig_wrapper.ranlib);
// Only setup AR when explicitly asked to
// because it need special executable name handling, see src/bin/cargo-zigbuild.rs
if enable_zig_ar {
add_env(format!("AR_{}", env_target), &zig_wrapper.ar);
}

Self::setup_os_deps(cargo)?;

Expand Down Expand Up @@ -592,14 +611,14 @@ pub fn prepare_zig_linker(target: &str) -> Result<ZigWrapper> {

let zig_cc = zig_linker_dir.join(zig_cc);
let zig_cxx = zig_linker_dir.join(zig_cxx);
let zig_ranlib = zig_linker_dir.join(format!("zigranlib.{}", file_ext));
write_linker_wrapper(&zig_cc, "cc", &cc_args)?;
write_linker_wrapper(&zig_cxx, "c++", &cc_args)?;
write_linker_wrapper(&zig_ranlib, "ranlib", "")?;

let exe_ext = if cfg!(windows) { ".exe" } else { "" };
let zig_ar = zig_linker_dir.join(format!("ar{}", exe_ext));
let zig_ranlib = zig_linker_dir.join(format!("ranlib{}", exe_ext));
symlink_wrapper(&zig_ar)?;
symlink_wrapper(&zig_ranlib)?;

Ok(ZigWrapper {
cc: zig_cc,
Expand Down