Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

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

Merged
3 commits merged into from
Oct 4, 2021
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1208fd7
Do not propagate host RUSTFLAGS when checking for WASM toolchain
koute Oct 4, 2021
3196155
Update utils/wasm-builder/src/prerequisites.rs
bkchr Oct 4, 2021
657e355
Update utils/wasm-builder/src/prerequisites.rs
bkchr Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions utils/wasm-builder/src/prerequisites.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down