Skip to content

Stop hardcode platform tag when using zig #2905

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

Merged
messense merged 1 commit into from
Dec 29, 2025
Merged

Stop hardcode platform tag when using zig #2905

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/build_options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,9 +749,10 @@ impl BuildContextBuilder {
// Zig bundles musl 1.2
Some(PlatformTag::Musllinux { major: 1, minor: 2 })
} else {
// With zig we can compile to any glibc version that we want, so we pick the lowest
// one supported by the rust compiler
Some(target.get_minimum_manylinux_tag())
// With zig we can compile to any glibc version that we want, but
// there are some black-listed libc symbols in auditwheel for manylinux <= 2.17/2024.
// Thus we let auditwheel decide the compatibility tag.
None
}
} else {
// Defaults to musllinux_1_2 for musl target if it's not bin bindings
Expand Down
20 changes: 2 additions & 18 deletions tests/common/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use cargo_zigbuild::Zig;
use clap::Parser;
use fs_err::File;
use fs4::fs_err3::FileExt;
use maturin::{BuildOptions, PlatformTag, PythonInterpreter, Target};
use maturin::{BuildOptions, PythonInterpreter, Target};
use normpath::PathExt;
use std::collections::HashSet;
use std::env;
Expand Down Expand Up @@ -66,13 +66,11 @@ pub fn test_integration(
#[cfg(not(feature = "zig"))]
let zig_found = false;

let test_zig = if zig && (env::var("GITHUB_ACTIONS").is_ok() || zig_found) {
if zig && (env::var("GITHUB_ACTIONS").is_ok() || zig_found) {
cli.push("--zig".into());
true
} else {
cli.push("--compatibility".into());
cli.push("linux".into());
false
};

// One scope up to extend the lifetime
Expand Down Expand Up @@ -161,20 +159,6 @@ pub fn test_integration(
// order they are in the build context
for ((filename, supported_version), python_interpreter) in wheels.iter().zip(interpreter) {
check_for_duplicates(filename)?;
if test_zig
&& build_context.target.is_linux()
&& !build_context.target.is_musl_libc()
&& build_context.target.get_minimum_manylinux_tag() != PlatformTag::Linux
{
let rustc_ver = rustc_version::version()?;
let python_arch = build_context.target.get_python_arch();
let file_suffix = if rustc_ver >= semver::Version::new(1, 64, 0) {
format!("manylinux_2_17_{python_arch}.manylinux2014_{python_arch}.whl")
} else {
format!("manylinux_2_12_{python_arch}.manylinux2010_{python_arch}.whl")
};
assert!(filename.to_string_lossy().ends_with(&file_suffix))
}
let mut venv_name = if supported_version == "py3" {
format!("{unique_name}-py3")
} else {
Expand Down
Loading