chore: wip

Author: dybucc

build.rs

@@ -133,11 +133,6 @@ fn main() {
         }
     }
 
-    let uclibc_use_time64 = env_flag("CARGO_CFG_LIBC_UNSTABLE_UCLIBC_TIME64");
-    if target_env == "uclibc" && uclibc_use_time64 {
-        set_cfg("linux_time_bits64");
-    }
-
     let linux_time_bits64 = env::var("RUST_LIBC_UNSTABLE_LINUX_TIME_BITS64").is_ok();
     println!("cargo:rerun-if-env-changed=RUST_LIBC_UNSTABLE_LINUX_TIME_BITS64");
     if linux_time_bits64 {
@@ -182,7 +177,9 @@ fn main() {
         }
     }
 
-    if target_env == "uclibc" && env::var("CARGO_CFG_LIBC_UNSTABLE_UCLIBC_FILE_OFFSET_BITS").is_ok()
+    if target_env == "uclibc"
+        && target_ptr_width == "32"
+        && env::var("CARGO_CFG_LIBC_UNSTABLE_UCLIBC_FILE_OFFSET_BITS").is_ok()
     {
         set_cfg("uclibc_file_offset_bits64");
     }

ci/verify-build.py

@@ -242,8 +242,15 @@ def run(
     args: Sequence[str | Path],
     *,
     env: Optional[dict[str, str]] = None,
+    extra_rustflags: Optional[str] = None,
     check: bool = True,
 ) -> sp.CompletedProcess:
+    if env is None:
+        env = os.environ.copy()
+
+    if extra_rustflags is not None:
+        env["RUSTFLAGS"] = env.get("RUSTFLAGS", "") + " " + extra_rustflags
+
     xtrace(args, env=env)
     return sp.run(args, env=env, check=check)
 
@@ -401,6 +408,10 @@ def test_target(cfg: Cfg, target: Target) -> TargetResult:
         # Check with breaking changes from musl, including 64-bit time_t on 32-bit
         run(cmd, env=env | {"RUST_LIBC_UNSTABLE_MUSL_V1_2_3": "1"})
 
+    if "uclibc" in target_env and target_bits == "32":
+        # Equivalent to __USE_FILE_OFFSET64.
+        run(cmd, extra_rustflags=env["RUSTFLAGS"] + "--cfg=libc_unstable_uclibc_file_offset_bits")
+
     # Test again without default features, i.e. without `std`
     run([*cmd, "--no-default-features"])
     run([*cmd, "--no-default-features", "--features=extra_traits"])