Skip to content

Commit 3ba7992

Browse files
Correctly generate stamp for gcc
1 parent 1fd148d commit 3ba7992

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/bootstrap/src/core/build_steps/gcc.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ pub fn prebuilt_gcc_config(builder: &Builder<'_>, target: TargetSelection) -> Gc
5353
static STAMP_HASH_MEMO: OnceLock<String> = OnceLock::new();
5454
let smart_stamp_hash = STAMP_HASH_MEMO.get_or_init(|| {
5555
generate_smart_stamp_hash(
56-
&builder.config.src.join("src/llvm-project"),
57-
builder.in_tree_llvm_info.sha().unwrap_or_default(),
56+
builder,
57+
&builder.config.src.join("src/gcc"),
58+
builder.in_tree_gcc_info.sha().unwrap_or_default(),
5859
)
5960
});
6061

src/bootstrap/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ pub struct Build {
145145
rustfmt_info: GitInfo,
146146
enzyme_info: GitInfo,
147147
in_tree_llvm_info: GitInfo,
148+
in_tree_gcc_info: GitInfo,
148149
local_rebuild: bool,
149150
fail_fast: bool,
150151
doc_tests: DocTests,
@@ -315,6 +316,7 @@ impl Build {
315316

316317
// we always try to use git for LLVM builds
317318
let in_tree_llvm_info = GitInfo::new(false, &src.join("src/llvm-project"));
319+
let in_tree_gcc_info = GitInfo::new(false, &src.join("src/gcc"));
318320

319321
let initial_target_libdir_str = if config.dry_run() {
320322
"/dummy/lib/path/to/lib/".to_string()
@@ -407,6 +409,7 @@ impl Build {
407409
rustfmt_info,
408410
enzyme_info,
409411
in_tree_llvm_info,
412+
in_tree_gcc_info,
410413
cc: RefCell::new(HashMap::new()),
411414
cxx: RefCell::new(HashMap::new()),
412415
ar: RefCell::new(HashMap::new()),

0 commit comments

Comments
 (0)