Skip to content

feat: follow the change [email protected] #368

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

Open
richerfu wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −1
Open

feat: follow the change [email protected] #368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c2180c
feat: follow the zig changes for ohos
richerfu Oct 3, 2025
d42777f
fix: arch condition
richerfu Oct 3, 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
18 changes: 17 additions & 1 deletion src/zig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,23 @@ pub fn prepare_zig_linker(target: &str) -> Result<ZigWrapper> {
"s390x" => "s390x",
_ => arch.as_str(),
};
cc_args.push(format!("-target {zig_arch}-linux-{target_env}{abi_suffix}"));
let mut zig_target_env = target_env.to_string();

let zig_version = Zig::zig_version()?;

// Since Zig 0.15.0, arm-linux-ohos changed to arm-linux-ohoseabi
// We need to follow the change but target_lexicon follow the LLVM target(https://github.com/bytecodealliance/target-lexicon/pull/123).
// So we use string directly.
if zig_version >= semver::Version::new(0, 15, 0)
&& arch.as_str() == "armv7"
&& target_env == Environment::Ohos
{
zig_target_env = "ohoseabi".to_string();
}

cc_args.push(format!(
"-target {zig_arch}-linux-{zig_target_env}{abi_suffix}"
));
}
OperatingSystem::MacOSX { .. } | OperatingSystem::Darwin(_) => {
let zig_version = Zig::zig_version()?;
Expand Down
Loading