Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use download-rustc = "if-unchanged" in x86_64-gnu #112143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Use download-rustc = "if-unchanged" in x86_64-gnu #112143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d0bcbf4
Make `--dry-run` more useful when download-rustc is enabled
jyn514 Jun 3, 2023
02bacb2
check ci-rustc options
jyn514 May 26, 2023
93733f9
fix `x test --stage 0 core`
jyn514 Jun 3, 2023
9cc1765
don't try to cross-compile sanitizer tests
jyn514 Jun 5, 2023
7f27750
allow mixing `llvm.assertions` and `download-rustc`
jyn514 Jul 1, 2023
96c2e2b
Move `ci_rustc_dir` to Config and use it consistently
jyn514 Jul 5, 2023
b80c2f8
Test `x86_64-gnu` in PR CI, not x86_64-gnu-llvm-14
jyn514 Jun 5, 2023
a6dcffa
Use `download-rustc = "if-unchanged"` in PR CI and `x86_64-gnu`
jyn514 May 31, 2023
20f9b0c
download-rustc: Don't consider the current commit for download if run…
jyn514 Jun 19, 2023
ce127e1
give a hard error if setting DOWNLOAD_RUSTC in a dist builder
jyn514 Jul 5, 2023
2c3ad2d
Don't depend on crate names in tests/ui-fulldeps/missing-rustc-driver…
jyn514 Jul 8, 2023
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
Next Next commit
Make --dry-run more useful when download-rustc is enabled 
Previously, it would always treat download-rustc as set to false, which made bootstrap issues with
download-rustc hard to debug.
  • Loading branch information
@jyn514
jyn514 committed Jul 9, 2023
commit d0bcbf4979db2014c0668c0016c353cb71978751
4 changes: 2 additions & 2 deletions src/bootstrap/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1813,11 +1813,11 @@ impl Config {
self.download_rustc_commit().is_some()
}

pub(crate) fn download_rustc_commit(&self) -> Option<&'static str> {
pub(crate) fn download_rustc_commit(&self) -> Option<&str> {
static DOWNLOAD_RUSTC: OnceCell<Option<String>> = OnceCell::new();
if self.dry_run() && DOWNLOAD_RUSTC.get().is_none() {
// avoid trying to actually download the commit
return None;
return self.download_rustc_commit.as_deref();
}

DOWNLOAD_RUSTC
Expand Down
4 changes: 4 additions & 0 deletions src/bootstrap/download.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,10 @@ impl Config {

fn ci_component_contents(&self, stamp_file: &str) -> Vec<String> {
assert!(self.download_rustc());
if self.dry_run() {
return vec![];
}

let ci_rustc_dir = self.out.join(&*self.build.triple).join("ci-rustc");
let stamp_file = ci_rustc_dir.join(stamp_file);
let contents_file = t!(File::open(&stamp_file), stamp_file.display().to_string());
Expand Down