diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-21 19:01:08 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-21 19:01:08 +0000 |
| commit | c07d1e2f88cb3b1a0604ae8f18b478c1aeb7a7fa (patch) | |
| tree | 534295af2dc906dc93c67142424904d6aebc9140 /scripts/setup_rust_fork.sh | |
| parent | 62f6e84ac1755f2c6c356a20113d12196d792e4f (diff) | |
| download | rust-c07d1e2f88cb3b1a0604ae8f18b478c1aeb7a7fa.tar.gz rust-c07d1e2f88cb3b1a0604ae8f18b478c1aeb7a7fa.zip | |
Use same --remap-path-prefix as bootstrap for testing the rustc test suite
This allows removing the CFG_VIRTUAL_RUST_SOURCE_BASE_DIR hack and re-enabling a fair amount of tests.
Diffstat (limited to 'scripts/setup_rust_fork.sh')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 6bcf56abb95..3e48fb006de 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -1,7 +1,10 @@ #!/usr/bin/env bash set -e -./y.sh build +# Compiletest expects all standard library paths to start with /rustc/FAKE_PREFIX. +# CG_CLIF_STDLIB_REMAP_PATH_PREFIX will cause cg_clif's build system to pass +# --remap-path-prefix to handle this. +CG_CLIF_STDLIB_REMAP_PATH_PREFIX=/rustc/FAKE_PREFIX ./y.sh build echo "[SETUP] Rust fork" git clone https://github.com/rust-lang/rust.git || true @@ -32,8 +35,6 @@ verbose-tests = false EOF popd -export CFG_VIRTUAL_RUST_SOURCE_BASE_DIR="$(cd build/stdlib; pwd)" - # Allow the testsuite to use llvm tools host_triple=$(rustc -vV | grep host | cut -d: -f2 | tr -d " ") export LLVM_BIN_DIR="$(rustc --print sysroot)/lib/rustlib/$host_triple/bin" |