Skip to content

ci: Re-enable ohos check builds #4804

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
merged 2 commits into from
Oct 30, 2025
Merged

ci: Re-enable ohos check builds #4804

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
642adfc
ci: Re-enable ohos check builds
tgross35 Oct 30, 2025
f76eb39
ohos: Don't emit duplicate lfs64 definitions
tgross35 Oct 30, 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
7 changes: 3 additions & 4 deletions ci/verify-build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ def __post_init__(self):

FREEBSD_VERSIONS = [11, 12, 13, 14, 15]

# FIXME(ohos): CI fails with warnings
TARGETS = [
# Tier 1
Target("aarch64-apple-darwin"),
Expand All @@ -83,11 +82,11 @@ def __post_init__(self):
# Tier 2 with host tools
Target("aarch64-pc-windows-gnullvm", min_toolchain=Toolchain.STABLE),
Target("aarch64-unknown-linux-musl"),
# Target("aarch64-unknown-linux-ohos"),
Target("aarch64-unknown-linux-ohos", min_toolchain=Toolchain.STABLE),
Target("arm-unknown-linux-gnueabi"),
Target("arm-unknown-linux-gnueabihf"),
Target("armv7-unknown-linux-gnueabihf"),
# Target("armv7-unknown-linux-ohos"),
Target("armv7-unknown-linux-ohos", min_toolchain=Toolchain.STABLE),
Target("i686-pc-windows-gnu"),
Target("loongarch64-unknown-linux-gnu", min_toolchain=Toolchain.STABLE),
Target("loongarch64-unknown-linux-musl", min_toolchain=Toolchain.STABLE),
Expand All @@ -104,7 +103,7 @@ def __post_init__(self):
Target("x86_64-unknown-freebsd"),
Target("x86_64-unknown-illumos"),
Target("x86_64-unknown-linux-musl"),
# Target("x86_64-unknown-linux-ohos"),
Target("x86_64-unknown-linux-ohos", min_toolchain=Toolchain.STABLE),
Target("x86_64-unknown-netbsd"),
#
# Tier 2 without host tools
Expand Down
4 changes: 2 additions & 2 deletions src/unix/linux_like/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ s! {
size: [u8; crate::__SIZEOF_PTHREAD_BARRIERATTR_T],
}

#[cfg(not(target_env = "musl"))]
#[cfg(not(any(target_env = "musl", target_env = "ohos")))]
#[repr(align(8))]
pub struct fanotify_event_metadata {
pub event_len: __u32,
Expand Down Expand Up @@ -6723,7 +6723,7 @@ extern "C" {
//
// * musl has 64-bit versions only so aliases the LFS64 symbols to the standard ones
cfg_if! {
if #[cfg(not(target_env = "musl"))] {
if #[cfg(not(any(target_env = "musl", target_env = "ohos")))] {
extern "C" {
pub fn fallocate64(fd: c_int, mode: c_int, offset: off64_t, len: off64_t) -> c_int;
pub fn fgetpos64(stream: *mut crate::FILE, ptr: *mut fpos64_t) -> c_int;
Expand Down
9 changes: 7 additions & 2 deletions src/unix/linux_like/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2100,7 +2100,11 @@ extern "C" {
// * musl and Emscripten has 64-bit versions only so aliases the LFS64 symbols to the standard ones
// * ulibc doesn't have preadv64/pwritev64
cfg_if! {
if #[cfg(not(any(target_env = "musl", target_os = "emscripten")))] {
if #[cfg(not(any(
target_env = "musl",
target_env = "ohos",
target_os = "emscripten",
)))] {
extern "C" {
pub fn fstatfs64(fd: c_int, buf: *mut statfs64) -> c_int;
pub fn statvfs64(path: *const c_char, buf: *mut statvfs64) -> c_int;
Expand Down Expand Up @@ -2160,7 +2164,8 @@ cfg_if! {
if #[cfg(not(any(
target_env = "uclibc",
target_env = "musl",
target_os = "emscripten"
target_env = "ohos",
target_os = "emscripten",
)))] {
extern "C" {
pub fn preadv64(
Expand Down
Loading