diff --git a/cli/loader/build.rs b/cli/loader/build.rs index b01f01bb..1da41b02 100644 --- a/cli/loader/build.rs +++ b/cli/loader/build.rs @@ -9,5 +9,8 @@ fn main() { ); let emscripten_version = std::fs::read_to_string("emscripten-version").unwrap(); - println!("cargo:rustc-env=EMSCRIPTEN_VERSION={emscripten_version}"); + println!( + "cargo:rustc-env=EMSCRIPTEN_VERSION={}", + emscripten_version.trim() + ); } diff --git a/xtask/src/build_wasm.rs b/xtask/src/build_wasm.rs index 10725277..43679835 100644 --- a/xtask/src/build_wasm.rs +++ b/xtask/src/build_wasm.rs @@ -107,7 +107,7 @@ pub fn run_wasm(args: &BuildWasm) -> Result<()> { }; // Run `emcc` in a container using the `emscripten-slim` image - command.args([EMSCRIPTEN_TAG.trim(), "emcc"]); + command.args([EMSCRIPTEN_TAG, "emcc"]); command } }; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 375571c0..8364d796 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -170,11 +170,12 @@ struct UpgradeWasmtime { const BUILD_VERSION: &str = env!("CARGO_PKG_VERSION"); const BUILD_SHA: Option<&str> = option_env!("BUILD_SHA"); -const EMSCRIPTEN_VERSION: &str = include_str!("../../cli/loader/emscripten-version"); +const EMSCRIPTEN_VERSION: &str = include_str!("../../cli/loader/emscripten-version").trim_ascii(); const EMSCRIPTEN_TAG: &str = concat!( "docker.io/emscripten/emsdk:", include_str!("../../cli/loader/emscripten-version") -); +) +.trim_ascii(); fn main() { let result = run();