Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c4c8bda
non_local_defs: indicate that the macro needs to change
Urgau May 29, 2024
b5d4867
non_local_defs: move cargo update suggestion upper
Urgau May 29, 2024
6d2493b
ci: Update centos:7 to use vault repos
cuviper Jun 12, 2024
54fa4b0
Use Variance glob import everywhere
compiler-errors Jun 12, 2024
4440f50
rustc_span: Add conveniences for working with span formats
petrochenkov Mar 3, 2024
6fea953
rustc_span: By-value interface for ctxt update
petrochenkov Jun 11, 2024
220f3ec
rustc_span: Remove transmutes from span encoding
petrochenkov Jun 13, 2024
669a400
MIR Shl/Shr: the offset can be computed with rem_euclid
RalfJung Jun 14, 2024
ad787c1
build `libcxx-version` only when it doesn't exist
onur-ozkan Jun 14, 2024
e2e1afa
update libstdc++ compatibility error log
onur-ozkan Jun 14, 2024
d3f1618
fix python bootstrap tests requiring a downloaded stage0
pietroalbini Jun 14, 2024
fcb6ff5
fix rust bootstrap tests requiring a downloaded stage0
pietroalbini Jun 14, 2024
584af35
Several fixes to the redox target specs
jackpot51 Jun 9, 2024
e14bf6c
Add i686-unknown-redox target
bjorn3 Jun 9, 2024
f9be8f2
Use Linux file locking on Redox
jackpot51 Feb 12, 2023
3b8cda5
Add dedicated platform support page for Redox OS
bjorn3 Jun 9, 2024
b81fa04
Rollup merge of #125722 - Urgau:non_local_defs-macro-to-change, r=est…
matthiaskrgr Jun 14, 2024
3e8ca48
Rollup merge of #125829 - petrochenkov:upctxt2, r=michaelwoerister
matthiaskrgr Jun 14, 2024
35b19f5
Rollup merge of #126192 - bjorn3:redox_patches, r=petrochenkov
matthiaskrgr Jun 14, 2024
47dcfb3
Rollup merge of #126352 - cuviper:centos7-vault, r=Kobzol
matthiaskrgr Jun 14, 2024
d088220
Rollup merge of #126354 - compiler-errors:variance, r=lcnr
matthiaskrgr Jun 14, 2024
e1001e4
Rollup merge of #126469 - RalfJung:mir-shifts, r=scottmcm
matthiaskrgr Jun 14, 2024
04b3114
Rollup merge of #126472 - onur-ozkan:improve-libcxx-build, r=Kobzol
matthiaskrgr Jun 14, 2024
d97c040
Rollup merge of #126476 - ferrocene:pa-bootstrap-test-local-rustc, r=…
matthiaskrgr Jun 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix rust bootstrap tests requiring a downloaded stage0
  • Loading branch information
pietroalbini committed Jun 14, 2024
commit fcb6ff5171fd41c988a6c449f76ff34c2c2d5a43
14 changes: 13 additions & 1 deletion src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,19 @@ impl Config {
pub fn parse(args: &[String]) -> Config {
#[cfg(test)]
fn get_toml(_: &Path) -> TomlConfig {
TomlConfig::default()
let mut default = TomlConfig::default();

// When configuring bootstrap for tests, make sure to set the rustc and Cargo to the
// same ones used to call the tests. If we don't do that, bootstrap will use its own
// detection logic to find a suitable rustc and Cargo, which doesn't work when the
// caller is specìfying a custom local rustc or Cargo in their config.toml.
default.build = Some(Build {
rustc: std::env::var_os("RUSTC").map(|v| v.into()),
cargo: std::env::var_os("CARGO").map(|v| v.into()),
..Build::default()
});

default
}

#[cfg(not(test))]
Expand Down