chore(cli): setjmp link path (#2808)

Brooooooklyn · web-flow · commit 552f9c9ac451 · 2025-07-24T21:24:28.000+08:00
diff --git a/cli/src/api/build.ts b/cli/src/api/build.ts
@@ -625,11 +625,11 @@ class Builder {
       )
       this.setEnvIfNotExists(
         'TARGET_CFLAGS',
-        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp`,
+        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
       )
       this.setEnvIfNotExists(
         'TARGET_CXXFLAGS',
-        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp`,
+        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
       )
       this.setEnvIfNotExists(
         `TARGET_LDFLAGS`,
diff --git a/crates/build/src/wasi.rs b/crates/build/src/wasi.rs
@@ -44,13 +44,18 @@ pub fn setup() {
       crt_reactor_path.display()
     );
   }
-  if let Ok(setjmp_link_dir) = env::var("SETJMP_LINK_DIR") {
-    println!("cargo:rustc-link-search={setjmp_link_dir}");
-    println!("cargo:rustc-link-lib=static=setjmp-mt");
-  }
   if let Ok(wasi_sdk_path) = env::var("WASI_SDK_PATH") {
     println!(
       "cargo:rustc-link-search={wasi_sdk_path}/share/wasi-sysroot/lib/wasm32-wasip1-threads"
     );
+    let setjmp_static_lib = Path::new(&wasi_sdk_path)
+      .join("share")
+      .join("wasi-sysroot")
+      .join("lib")
+      .join("wasm32-wasip1-threads")
+      .join("libsetjmp.a");
+    if setjmp_static_lib.exists() {
+      println!("cargo:rustc-link-lib=static=setjmp");
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -625,11 +625,11 @@ class Builder {`
`625`	`625`	`)`
`626`	`626`	`this.setEnvIfNotExists(`
`627`	`627`	`'TARGET_CFLAGS',`
`628`		- `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp`,
	`628`	+ `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
`629`	`629`	`)`
`630`	`630`	`this.setEnvIfNotExists(`
`631`	`631`	`'TARGET_CXXFLAGS',`
`632`		- `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp`,
	`632`	+ `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
`633`	`633`	`)`
`634`	`634`	`this.setEnvIfNotExists(`
`635`	`635`	`TARGET_LDFLAGS`,