Skip to content

Commit d0e0e03

Browse files
authored
fix(xtask): properly trim emscripten version at the source (tree-sitter#4402)
* fix(xtask): properly trim emscripten version at the source * fix(loader): trim emscripten version in `cargo:rustc-env=` print
1 parent ca7ff03 commit d0e0e03

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

cli/loader/build.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ fn main() {
99
);
1010

1111
let emscripten_version = std::fs::read_to_string("emscripten-version").unwrap();
12-
println!("cargo:rustc-env=EMSCRIPTEN_VERSION={emscripten_version}");
12+
println!(
13+
"cargo:rustc-env=EMSCRIPTEN_VERSION={}",
14+
emscripten_version.trim()
15+
);
1316
}

xtask/src/build_wasm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub fn run_wasm(args: &BuildWasm) -> Result<()> {
107107
};
108108

109109
// Run `emcc` in a container using the `emscripten-slim` image
110-
command.args([EMSCRIPTEN_TAG.trim(), "emcc"]);
110+
command.args([EMSCRIPTEN_TAG, "emcc"]);
111111
command
112112
}
113113
};

xtask/src/main.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,12 @@ struct UpgradeWasmtime {
170170

171171
const BUILD_VERSION: &str = env!("CARGO_PKG_VERSION");
172172
const BUILD_SHA: Option<&str> = option_env!("BUILD_SHA");
173-
const EMSCRIPTEN_VERSION: &str = include_str!("../../cli/loader/emscripten-version");
173+
const EMSCRIPTEN_VERSION: &str = include_str!("../../cli/loader/emscripten-version").trim_ascii();
174174
const EMSCRIPTEN_TAG: &str = concat!(
175175
"docker.io/emscripten/emsdk:",
176176
include_str!("../../cli/loader/emscripten-version")
177-
);
177+
)
178+
.trim_ascii();
178179

179180
fn main() {
180181
let result = run();

0 commit comments

Comments
 (0)