mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly generate stamp for gcc

Browse Source
This commit is contained in:
Guillaume Gomez 2024-07-16 18:55:14 +02:00
parent 1fd148d560
commit 3ba7992272
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bootstrap/src/core/build_steps/gcc.rs
View File

@ -53,8 +53,9 @@ pub fn prebuilt_gcc_config(builder: &Builder<'_>, target: TargetSelection) -> Gc
static STAMP_HASH_MEMO: OnceLock<String> = OnceLock::new(); static STAMP_HASH_MEMO: OnceLock<String> = OnceLock::new();
let smart_stamp_hash = STAMP_HASH_MEMO.get_or_init(|| { let smart_stamp_hash = STAMP_HASH_MEMO.get_or_init(|| {
generate_smart_stamp_hash( generate_smart_stamp_hash(
&builder.config.src.join("src/llvm-project"), builder,
builder.in_tree_llvm_info.sha().unwrap_or_default(), &builder.config.src.join("src/gcc"),
builder.in_tree_gcc_info.sha().unwrap_or_default(),
) )
}); });

3
src/bootstrap/src/lib.rs
View File

@ -145,6 +145,7 @@ pub struct Build {
rustfmt_info: GitInfo, rustfmt_info: GitInfo,
enzyme_info: GitInfo, enzyme_info: GitInfo,
in_tree_llvm_info: GitInfo, in_tree_llvm_info: GitInfo,
in_tree_gcc_info: GitInfo,
local_rebuild: bool, local_rebuild: bool,
fail_fast: bool, fail_fast: bool,
doc_tests: DocTests, doc_tests: DocTests,
@ -315,6 +316,7 @@ pub fn new(mut config: Config) -> Build {
// we always try to use git for LLVM builds // we always try to use git for LLVM builds
let in_tree_llvm_info = GitInfo::new(false, &src.join("src/llvm-project")); let in_tree_llvm_info = GitInfo::new(false, &src.join("src/llvm-project"));
let in_tree_gcc_info = GitInfo::new(false, &src.join("src/gcc"));
let initial_target_libdir_str = if config.dry_run() { let initial_target_libdir_str = if config.dry_run() {
"/dummy/lib/path/to/lib/".to_string() "/dummy/lib/path/to/lib/".to_string()
@ -407,6 +409,7 @@ pub fn new(mut config: Config) -> Build {
rustfmt_info, rustfmt_info,
enzyme_info, enzyme_info,
in_tree_llvm_info, in_tree_llvm_info,
in_tree_gcc_info,
cc: RefCell::new(HashMap::new()), cc: RefCell::new(HashMap::new()),
cxx: RefCell::new(HashMap::new()), cxx: RefCell::new(HashMap::new()),
ar: RefCell::new(HashMap::new()), ar: RefCell::new(HashMap::new()),