Skip to content

Commit

Permalink
Try --no-self-update
Browse files Browse the repository at this point in the history
  • Loading branch information
ascjones committed Aug 12, 2022
1 parent 8092386 commit 0bcbf03
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ fn build_and_zip_dylint_driver(
"--component",
"llvm-tools-preview",
"rustc-dev",
"--no-self-update",
]);

let child = install_toolchain
Expand Down Expand Up @@ -208,6 +209,7 @@ fn build_and_zip_dylint_driver(
"--locked",
&target_dir,
&manifest_arg,
"--no-self-update",
]);

// There are generally problems with having a custom `rustc` wrapper, while
Expand All @@ -216,13 +218,6 @@ fn build_and_zip_dylint_driver(
// Until we have a justification for leaving the wrapper we should unset it.
cmd.env_remove("RUSTC_WRAPPER");

// We need to remove those environment variables because `dylint` uses a
// fixed Rust toolchain via the `ink_linting/rust-toolchain` file. By removing
// these env variables we avoid issues with different Rust toolchains
// interfering with each other.
cmd.env_remove("RUSTUP_TOOLCHAIN");
cmd.env_remove("CARGO_TARGET_DIR");

println!(
"Setting cargo working dir to '{}'",
ink_dylint_driver_dir.display()
Expand Down

0 comments on commit 0bcbf03

Please sign in to comment.