-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Add a tidy check for GCC submodule version #137683
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Submodule gcc
updated
29018 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,47 @@ | ||||||||||||||||||||||||||||||||||
//! Tidy check to ensure that the commit SHA of the `src/gcc` submodule is the same as the | ||||||||||||||||||||||||||||||||||
//! required GCC version of the GCC codegen backend. | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
use std::path::Path; | ||||||||||||||||||||||||||||||||||
use std::process::Command; | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
pub fn check(root_path: &Path, compiler_path: &Path, bad: &mut bool) { | ||||||||||||||||||||||||||||||||||
let cg_gcc_version_path = compiler_path.join("rustc_codegen_gcc/libgccjit.version"); | ||||||||||||||||||||||||||||||||||
let cg_gcc_version = std::fs::read_to_string(&cg_gcc_version_path) | ||||||||||||||||||||||||||||||||||
.expect(&format!("Cannot read GCC version from {}", cg_gcc_version_path.display())) | ||||||||||||||||||||||||||||||||||
.trim() | ||||||||||||||||||||||||||||||||||
.to_string(); | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
let git_output = Command::new("git") | ||||||||||||||||||||||||||||||||||
.current_dir(root_path) | ||||||||||||||||||||||||||||||||||
.arg("submodule") | ||||||||||||||||||||||||||||||||||
.arg("status") | ||||||||||||||||||||||||||||||||||
// --cached asks for the version that is actually committed in the repository, not the one | ||||||||||||||||||||||||||||||||||
// that is currently checked out. | ||||||||||||||||||||||||||||||||||
.arg("--cached") | ||||||||||||||||||||||||||||||||||
.arg("src/gcc") | ||||||||||||||||||||||||||||||||||
.output() | ||||||||||||||||||||||||||||||||||
.expect("Cannot determine git SHA of the src/gcc checkout"); | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
// This can return e.g. | ||||||||||||||||||||||||||||||||||
// -e607be166673a8de9fc07f6f02c60426e556c5f2 src/gcc | ||||||||||||||||||||||||||||||||||
// e607be166673a8de9fc07f6f02c60426e556c5f2 src/gcc (master-e607be166673a8de9fc07f6f02c60426e556c5f2.e607be) | ||||||||||||||||||||||||||||||||||
// +e607be166673a8de9fc07f6f02c60426e556c5f2 src/gcc (master-e607be166673a8de9fc07f6f02c60426e556c5f2.e607be) | ||||||||||||||||||||||||||||||||||
let git_output = String::from_utf8_lossy(&git_output.stdout) | ||||||||||||||||||||||||||||||||||
.trim() | ||||||||||||||||||||||||||||||||||
.split_whitespace() | ||||||||||||||||||||||||||||||||||
.next() | ||||||||||||||||||||||||||||||||||
.unwrap_or_default() | ||||||||||||||||||||||||||||||||||
.to_string(); | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
// The SHA can start with + if the submodule is modified or - if it is not checked out. | ||||||||||||||||||||||||||||||||||
let gcc_submodule_sha = git_output.trim_start_matches(&['+', '-']); | ||||||||||||||||||||||||||||||||||
Comment on lines
+29
to
+37
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||||||
if gcc_submodule_sha != cg_gcc_version { | ||||||||||||||||||||||||||||||||||
*bad = true; | ||||||||||||||||||||||||||||||||||
eprintln!( | ||||||||||||||||||||||||||||||||||
r#"Commit SHA of the src/gcc submodule (`{gcc_submodule_sha}`) does not match the required GCC version of the GCC codegen backend (`{cg_gcc_version}`). | ||||||||||||||||||||||||||||||||||
Make sure to set the src/gcc submodule to commit {cg_gcc_version}. | ||||||||||||||||||||||||||||||||||
The GCC codegen backend commit is configured at {}."#, | ||||||||||||||||||||||||||||||||||
cg_gcc_version_path.display(), | ||||||||||||||||||||||||||||||||||
); | ||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
to_string
allocation doesn't matter here, so I would rather just keep the original.