diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2022-07-25 16:07:57 +0200 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2022-07-25 16:07:57 +0200 |
| commit | 640c3f730a998f7f5ba82ea4a2363d92064e7bc4 (patch) | |
| tree | bd7fd2c6eb9d736cfbc9f72535e1a36880e04d98 /scripts/setup_rust_fork.sh | |
| parent | 745193d1971620f73bbab3a2b9391728d9210d30 (diff) | |
| download | rust-640c3f730a998f7f5ba82ea4a2363d92064e7bc4.tar.gz rust-640c3f730a998f7f5ba82ea4a2363d92064e7bc4.zip | |
Merge commit 'c19edfd71a1d0ddef86c2c67fdb40718d40a72b4' into sync_cg_clif-2022-07-25
Diffstat (limited to 'scripts/setup_rust_fork.sh')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 4d0dfa16c5e..091bfa1e992 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -29,14 +29,15 @@ diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/ru index 8431aa7b818..a3ff7e68ce5 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs -@@ -3489,11 +3489,7 @@ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> S - .join("library"); - normalize_path(&src_dir, "$(echo '$SRC_DIR')"); +@@ -3489,12 +3489,7 @@ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> S + let compiler_src_dir = base_dir.join("compiler"); + normalize_path(&compiler_src_dir, "$(echo '$COMPILER_DIR')"); - if let Some(virtual_rust_source_base_dir) = - option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from) - { - normalize_path(&virtual_rust_source_base_dir.join("library"), "$(echo '$SRC_DIR')"); +- normalize_path(&virtual_rust_source_base_dir.join("compiler"), "$(echo '$COMPILER_DIR')"); - } + normalize_path(&Path::new("$(cd ../build_sysroot/sysroot_src/library; pwd)"), "$(echo '$SRC_DIR')"); @@ -62,3 +63,6 @@ deny-warnings = false verbose-tests = false EOF popd + +# FIXME remove once inline asm is fully supported +export RUSTFLAGS="$RUSTFLAGS --cfg=rustix_use_libc" |