pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 07:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not propagate host RUSTFLAGS when checking for WASM toolchain (#9926)

Browse Source 
* Do not propagate host RUSTFLAGS when checking for WASM toolchain

* Update utils/wasm-builder/src/prerequisites.rs

* Update utils/wasm-builder/src/prerequisites.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Koute
2021-10-04 22:28:51 +09:00
committed by GitHub
parent 73d765ec30
commit 886c42c5c8
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/utils/wasm-builder/src/prerequisites.rs
+7
View File
@@ -138,6 +138,13 @@ fn check_wasm_toolchain_installed(
build_cmd.env_remove("CARGO_TARGET_DIR");
run_cmd.env_remove("CARGO_TARGET_DIR");
// Make sure the host's flags aren't used here, e.g. if an alternative linker is specified
// in the RUSTFLAGS then the check we do here will break unless we clear these.
build_cmd.env_remove("CARGO_ENCODED_RUSTFLAGS");
run_cmd.env_remove("CARGO_ENCODED_RUSTFLAGS");
build_cmd.env_remove("RUSTFLAGS");
run_cmd.env_remove("RUSTFLAGS");
build_cmd.output().map_err(|_| err_msg.clone()).and_then(|s| {
if s.status.success() {
let version = run_cmd.output().ok().and_then(|o| String::from_utf8(o.stdout).ok());