From 82d2a48896e1b860e4af2342a484eb49361c672d Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Thu, 27 Aug 2020 16:03:05 -0700 Subject: [PATCH] wiggle-wasmtime: witx paths should be relative to CARGO_MANIFEST_DIR, not WASI_ROOT the WASI_ROOT was leftover from when this code was part of `wig`. --- crates/wiggle/wasmtime/macro/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/wiggle/wasmtime/macro/src/lib.rs b/crates/wiggle/wasmtime/macro/src/lib.rs index ff1df0898c..160babeb12 100644 --- a/crates/wiggle/wasmtime/macro/src/lib.rs +++ b/crates/wiggle/wasmtime/macro/src/lib.rs @@ -48,9 +48,9 @@ use config::{MissingMemoryConf, ModuleConf, TargetConf}; #[proc_macro] pub fn wasmtime_integration(args: TokenStream) -> TokenStream { let mut config = parse_macro_input!(args as config::Config); - config - .witx - .make_paths_relative_to(std::env::var("WASI_ROOT").expect("WASI_ROOT env var")); + config.witx.make_paths_relative_to( + std::env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR env var"), + ); let doc = config.load_document(); let names = Names::new(&config.ctx.name, quote!(wasmtime_wiggle));