Skip to content

Commit 8f9796e

Browse files
committed
Add RUST_LIBC_UNSTABLE_EMCC_VERSION for wasm32-unknown-emscripten
1 parent 1d0327f commit 8f9796e

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ jobs:
179179
- powerpc64le-unknown-linux-gnu
180180
- riscv64gc-unknown-linux-gnu
181181
- s390x-unknown-linux-gnu
182-
- wasm32-unknown-emscripten
183182
- wasm32-wasip1
184183
- wasm32-wasip2
185184
- x86_64-linux-android
@@ -195,6 +194,9 @@ jobs:
195194
env:
196195
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
197196
artifact-tag: offset-bits64
197+
- target: wasm32-unknown-emscripten
198+
env:
199+
RUST_LIBC_UNSTABLE_EMCC_VERSION: 30142
198200
# FIXME(ppc): SIGILL running tests, see
199201
# https://github.com/rust-lang/libc/pull/4254#issuecomment-2636288713
200202
# - target: powerpc-unknown-linux-gnu

build.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,15 @@ fn main() {
8282
_ => set_cfg("freebsd15"),
8383
}
8484

85-
match emcc_version_code() {
85+
println!("cargo:rerun-if-env-changed=RUST_LIBC_UNSTABLE_EMCC_VERSION");
86+
let emcc_version = if let Ok(version) = env::var("RUST_LIBC_UNSTABLE_EMCC_VERSION") {
87+
let vers: i32 = version.parse().unwrap();
88+
println!("cargo:warning=setting emcc version to {vers}");
89+
Some(vers as u64)
90+
} else {
91+
emcc_version_code()
92+
};
93+
match emcc_version {
8694
Some(v) if (v < 30142) => set_cfg("emscripten_old_stat_abi"),
8795
// Non-Emscripten or version >= 3.1.42.
8896
_ => (),

0 commit comments

Comments
 (0)