move wasi-c2 into wasi-common

crates/wasi-c2/build.rs

@@ -1,10 +0,0 @@
-// Tell any dependencies, if necessary, where our WASI submodule is so they can
-// use the same witx files if they want.
-fn main() {
-    let cwd = std::env::current_dir().unwrap();
-    let wasi = cwd.join("..").join("wasi-common").join("WASI");
-    // this will be available to dependent crates via the DEP_WASI_C2_19_WASI env var:
-    println!("cargo:wasi={}", wasi.display());
-    // and available to our own crate as WASI_ROOT:
-    println!("cargo:rustc-env=WASI_ROOT={}", wasi.display());
-}

crates/wasi-common/build.rs

@@ -2,7 +2,9 @@
 // use the same witx files if they want.
 fn main() {
     let cwd = std::env::current_dir().unwrap();
-    let wasi = cwd.join("WASI");
+    let wasi = cwd.join("..").join("wasi-common").join("WASI");
+    // this will be available to dependent crates via the DEP_WASI_C2_19_WASI env var:
     println!("cargo:wasi={}", wasi.display());
+    // and available to our own crate as WASI_ROOT:
     println!("cargo:rustc-env=WASI_ROOT={}", wasi.display());
 }