diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2022-10-05 13:55:13 +0200 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2022-10-05 13:55:13 +0200 |
| commit | dae6a30d0b888a02e8b3a450510b8683f920cb16 (patch) | |
| tree | b52acaba90239dcaf8e5c88e8e57315c1dc11cd7 /scripts | |
| parent | 1d1827413f165d4b081253aa9b225a52a24d3c1d (diff) | |
| download | rust-dae6a30d0b888a02e8b3a450510b8683f920cb16.tar.gz rust-dae6a30d0b888a02e8b3a450510b8683f920cb16.zip | |
Remove workaround for rustbuild bug
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 25103a2fd50..d6a37789599 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -27,21 +27,6 @@ index d95b5b7f17f..00b6f0e3635 100644 [dev-dependencies] rand = "0.7" rand_xorshift = "0.2" -diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index a6333976f2a..c9a872e876c 100644 ---- a/src/bootstrap/config.rs -+++ b/src/bootstrap/config.rs -@@ -917,6 +917,10 @@ pub fn parse(args: &[String]) -> Config { - config.initial_cargo = config.out.join(config.build.triple).join("stage0/bin/cargo"); - } - -+ // Workaround for rustbuild bug -+ config.initial_rustc = PathBuf::from("$(pwd)/../build/rustc-clif"); -+ config.initial_cargo = PathBuf::from("$(rustup which cargo)"); -+ - // NOTE: it's important this comes *after* we set \`initial_rustc\` just above. - if config.dry_run { - let dir = config.out.join("tmp-dry-run"); diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 8431aa7b818..a3ff7e68ce5 100644 --- a/src/tools/compiletest/src/runtest.rs |