diff options
| author | bors <bors@rust-lang.org> | 2023-06-17 19:16:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-17 19:16:11 +0000 |
| commit | 3b2073f0762cff4d3d625bb10017e0ce4e7abe50 (patch) | |
| tree | 3fb5fa730941ac781a9a2c3780c7e608e45b8596 /src | |
| parent | a8a29070f07e47a244c8199ad582f93172019743 (diff) | |
| parent | 5518eb863f3a4db17de449a0945e1d6647bda97d (diff) | |
| download | rust-3b2073f0762cff4d3d625bb10017e0ce4e7abe50.tar.gz rust-3b2073f0762cff4d3d625bb10017e0ce4e7abe50.zip | |
Auto merge of #112746 - matthiaskrgr:rollup-se59bfd, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #110805 (Github action to periodically `cargo update` to keep dependencies current) - #112435 (Allow overwriting the sysroot compile flag via --rustc-args) - #112610 (Bump stdarch) - #112619 (Suggest bumping download-ci-llvm-stamp if the build config for llvm changes) - #112738 (make ice msg "Unknown runtime phase" a bit nicer) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 8c744d5d3c4..25b16e38e53 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1951,7 +1951,9 @@ impl<'test> TestCx<'test> { rustc.arg("-Ztranslate-remapped-path-to-local-path=no"); // Optionally prevent default --sysroot if specified in test compile-flags. - if !self.props.compile_flags.iter().any(|flag| flag.starts_with("--sysroot")) { + if !self.props.compile_flags.iter().any(|flag| flag.starts_with("--sysroot")) + && !self.config.host_rustcflags.iter().any(|flag| flag == "--sysroot") + { // In stage 0, make sure we use `stage0-sysroot` instead of the bootstrap sysroot. rustc.arg("--sysroot").arg(&self.config.sysroot_base); } |