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

Include current_exe in hash for linker wrapper path #319

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Include current_exe in hash for linker wrapper path #319

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77a660b
Include current_exe in hash for linker wrapper path
tuxu Feb 13, 2025
14aa1e1
Include hash also in ar and lib symlink paths
tuxu Feb 13, 2025
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
45 changes: 19 additions & 26 deletions src/zig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ use std::str;
use anyhow::{anyhow, bail, Context, Result};
use fs_err as fs;
use path_slash::PathBufExt;
#[cfg(not(target_family = "unix"))]
use path_slash::PathExt;
use serde::Deserialize;
use target_lexicon::{Architecture, Environment, OperatingSystem, Triple};

Expand Down Expand Up @@ -1368,20 +1370,26 @@ pub fn prepare_zig_linker(target: &str) -> Result<ZigWrapper> {
}
}

let current_exe = if let Ok(exe) = env::var("CARGO_BIN_EXE_cargo-zigbuild") {
PathBuf::from(exe)
} else {
env::current_exe()?
};
let cc_args_str = cc_args.join(" ");
let hash = crc::Crc::<u16>::new(&crc::CRC_16_IBM_SDLC).checksum(cc_args_str.as_bytes());
let hash_input = current_exe.display().to_string() + &cc_args_str;
let hash = crc::Crc::<u16>::new(&crc::CRC_16_IBM_SDLC).checksum(hash_input.as_bytes());
let zig_cc = zig_linker_dir.join(format!("zigcc-{file_target}-{:x}.{file_ext}", hash));
let zig_cxx = zig_linker_dir.join(format!("zigcxx-{file_target}-{:x}.{file_ext}", hash));
let zig_ranlib = zig_linker_dir.join(format!("zigranlib.{file_ext}"));
write_linker_wrapper(&zig_cc, "cc", &cc_args_str)?;
write_linker_wrapper(&zig_cxx, "c++", &cc_args_str)?;
write_linker_wrapper(&zig_ranlib, "ranlib", "")?;
write_linker_wrapper(&current_exe, &zig_cc, "cc", &cc_args_str)?;
write_linker_wrapper(&current_exe, &zig_cxx, "c++", &cc_args_str)?;
write_linker_wrapper(&current_exe, &zig_ranlib, "ranlib", "")?;

let exe_ext = if cfg!(windows) { ".exe" } else { "" };
let zig_ar = zig_linker_dir.join(format!("ar{exe_ext}"));
symlink_wrapper(&zig_ar)?;
let zig_lib = zig_linker_dir.join(format!("lib{exe_ext}"));
symlink_wrapper(&zig_lib)?;
let zig_ar = zig_linker_dir.join(format!("ar-{:x}{exe_ext}", hash));
symlink_wrapper(&current_exe, &zig_ar)?;
let zig_lib = zig_linker_dir.join(format!("lib-{:x}{exe_ext}", hash));
symlink_wrapper(&current_exe, &zig_lib)?;

Ok(ZigWrapper {
cc: zig_cc,
Expand All @@ -1392,12 +1400,7 @@ pub fn prepare_zig_linker(target: &str) -> Result<ZigWrapper> {
})
}

fn symlink_wrapper(target: &Path) -> Result<()> {
let current_exe = if let Ok(exe) = env::var("CARGO_BIN_EXE_cargo-zigbuild") {
PathBuf::from(exe)
} else {
env::current_exe()?
};
fn symlink_wrapper(current_exe: &Path, target: &Path) -> Result<()> {
#[cfg(windows)]
{
if !target.exists() {
Expand All @@ -1424,13 +1427,8 @@ fn symlink_wrapper(target: &Path) -> Result<()> {

/// Write a zig cc wrapper batch script for unix
#[cfg(target_family = "unix")]
fn write_linker_wrapper(path: &Path, command: &str, args: &str) -> Result<()> {
fn write_linker_wrapper(current_exe: &Path, path: &Path, command: &str, args: &str) -> Result<()> {
let mut buf = Vec::<u8>::new();
let current_exe = if let Ok(exe) = env::var("CARGO_BIN_EXE_cargo-zigbuild") {
PathBuf::from(exe)
} else {
env::current_exe()?
};
writeln!(&mut buf, "#!/bin/sh")?;
writeln!(
&mut buf,
Expand Down Expand Up @@ -1458,13 +1456,8 @@ fn write_linker_wrapper(path: &Path, command: &str, args: &str) -> Result<()> {

/// Write a zig cc wrapper batch script for windows
#[cfg(not(target_family = "unix"))]
fn write_linker_wrapper(path: &Path, command: &str, args: &str) -> Result<()> {
fn write_linker_wrapper(current_exe: &Path, path: &Path, command: &str, args: &str) -> Result<()> {
let mut buf = Vec::<u8>::new();
let current_exe = if let Ok(exe) = env::var("CARGO_BIN_EXE_cargo-zigbuild") {
PathBuf::from(exe)
} else {
env::current_exe()?
};
let current_exe = if is_mingw_shell() {
current_exe.to_slash_lossy().to_string()
} else {
Expand Down
Loading