diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-07-16 18:55:14 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-09-06 16:01:46 +0200 |
| commit | 3ba799227282f07c1a3aa5e23bbf0761867b0ada (patch) | |
| tree | 8dde30e235f40b71632ececf162dc2ba811a858f | |
| parent | 1fd148d560a3d5ab2826c3827a4d9b4d8205ec96 (diff) | |
| download | rust-3ba799227282f07c1a3aa5e23bbf0761867b0ada.tar.gz rust-3ba799227282f07c1a3aa5e23bbf0761867b0ada.zip | |
Correctly generate stamp for gcc
| -rw-r--r-- | src/bootstrap/src/core/build_steps/gcc.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/src/lib.rs | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/src/core/build_steps/gcc.rs b/src/bootstrap/src/core/build_steps/gcc.rs index c11782c5b14..01a7eee60a4 100644 --- a/src/bootstrap/src/core/build_steps/gcc.rs +++ b/src/bootstrap/src/core/build_steps/gcc.rs @@ -53,8 +53,9 @@ pub fn prebuilt_gcc_config(builder: &Builder<'_>, target: TargetSelection) -> Gc static STAMP_HASH_MEMO: OnceLock<String> = OnceLock::new(); let smart_stamp_hash = STAMP_HASH_MEMO.get_or_init(|| { generate_smart_stamp_hash( - &builder.config.src.join("src/llvm-project"), - builder.in_tree_llvm_info.sha().unwrap_or_default(), + builder, + &builder.config.src.join("src/gcc"), + builder.in_tree_gcc_info.sha().unwrap_or_default(), ) }); diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 4ae78511669..21978153f65 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -145,6 +145,7 @@ pub struct Build { rustfmt_info: GitInfo, enzyme_info: GitInfo, in_tree_llvm_info: GitInfo, + in_tree_gcc_info: GitInfo, local_rebuild: bool, fail_fast: bool, doc_tests: DocTests, @@ -315,6 +316,7 @@ impl Build { // 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_gcc_info = GitInfo::new(false, &src.join("src/gcc")); let initial_target_libdir_str = if config.dry_run() { "/dummy/lib/path/to/lib/".to_string() @@ -407,6 +409,7 @@ impl Build { rustfmt_info, enzyme_info, in_tree_llvm_info, + in_tree_gcc_info, cc: RefCell::new(HashMap::new()), cxx: RefCell::new(HashMap::new()), ar: RefCell::new(HashMap::new()), |