From af385f21fa40a7da7ff5537fd859300d3b59459c Mon Sep 17 00:00:00 2001 From: messense Date: Wed, 18 Feb 2026 16:50:02 +0800 Subject: [PATCH] Update cargo-zigbuild to 0.22.1 --- Cargo.lock | 10 ++++++---- Cargo.toml | 2 +- src/main.rs | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e908664db..5ba6f3a70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -326,9 +326,9 @@ dependencies = [ [[package]] name = "cargo-zigbuild" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e8a44660dbbfed47703c23423cbb93814b6d16e357d1c6b2d8a8b158ef0e52" +checksum = "6a72970dc4f54505e68b934ae90af6040a3edea6af820f535421e00d510b7984" dependencies = [ "anyhow", "cargo-config2", @@ -338,9 +338,11 @@ dependencies = [ "crc", "dirs", "fs-err", + "goblin", "path-slash", "rustc_version", "rustflags", + "scroll", "semver", "serde", "serde_json", @@ -1158,9 +1160,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db6758c546e6f81f265638c980e5e84dfbda80cfd8e89e02f83454c8e8124bd" +checksum = "983a6aafb3b12d4c41ea78d39e189af4298ce747353945ff5105b54a056e5cd9" dependencies = [ "log", "plain", diff --git a/Cargo.toml b/Cargo.toml index 7ce9fd941..e063e9001 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ clap = { version = "4.0.0", features = [ clap_complete_command = { version = "0.6.1", optional = true } # cross compile -cargo-zigbuild = { version = "0.22.0", default-features = false, optional = true } +cargo-zigbuild = { version = "0.22.1", default-features = false, optional = true } cargo-xwin = { version = "0.19.2", default-features = false, optional = true } xz2 = { version = "0.1", optional = true } diff --git a/src/main.rs b/src/main.rs index 8229a2ade..617278987 100644 --- a/src/main.rs +++ b/src/main.rs @@ -369,7 +369,7 @@ fn pep517(subcommand: Pep517Command) -> Result<()> { fn run() -> Result<()> { #[cfg(feature = "zig")] { - // Allow symlink `maturin` to `ar` to invoke `zig ar` + // Allow symlink `maturin` to various tool names to invoke zig wrappers // See https://github.com/messense/cargo-zigbuild/issues/52 let mut args = env::args(); let program_path = PathBuf::from(args.next().expect("no program path")); @@ -380,6 +380,21 @@ fn run() -> Result<()> { }; zig.execute()?; return Ok(()); + } else if program_name.eq_ignore_ascii_case("lib") { + let zig = Zig::Lib { + args: args.collect(), + }; + zig.execute()?; + return Ok(()); + } else if program_name.to_string_lossy().ends_with("dlltool") { + let zig = Zig::Dlltool { + args: args.collect(), + }; + zig.execute()?; + return Ok(()); + } else if program_name.eq_ignore_ascii_case("install_name_tool") { + cargo_zigbuild::macos::install_name_tool::execute(args)?; + return Ok(()); } }