cleanup: more changes for wasip1

extism · Nov 8, 2024 · 759f091 · 759f091
1 parent 127efcb
commit 759f091
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/bin/build.rs b/bin/build.rs
@@ -6,7 +6,7 @@ fn main() {
         println!("cargo::rerun-if-changed={path}");
         std::fs::copy(path, out).unwrap();
     } else {
-        println!("cargo::rerun-if-changed=../lib/target/wasm32-wasi/release/core.wasm");
-        std::fs::copy("../lib/target/wasm32-wasi/release/core.wasm", out).unwrap();
+        println!("cargo::rerun-if-changed=../lib/target/wasm32-wasip1/release/core.wasm");
+        std::fs::copy("../lib/target/wasm32-wasip1/release/core.wasm", out).unwrap();
     }
 }
diff --git a/bin/src/opt.rs b/bin/src/opt.rs
@@ -22,11 +22,21 @@ fn find_deps() -> PathBuf {
         return in_repo;
     }
 
+    let in_repo = PathBuf::from("../lib/target/wasm32-wasip1/wasi-deps");
+    if in_repo.exists() {
+        return in_repo;
+    }
+
     let in_repo_root = PathBuf::from("lib/target/wasm32-wasi/wasi-deps");
     if in_repo_root.exists() {
         return in_repo_root;
     }
 
+    let in_repo_root = PathBuf::from("lib/target/wasm32-wasip1/wasi-deps");
+    if in_repo_root.exists() {
+        return in_repo_root;
+    }
+
     let usr_local_share = PathBuf::from("/usr/local/share/extism-py");
     if usr_local_share.exists() {
         return usr_local_share;