Skip to content

Commit b5fbca3

Browse files
committed
WIP: pin GCC commit
1 parent 545c5d3 commit b5fbca3

File tree

1 file changed

+26
-25
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+26
-25
lines changed

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

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -266,29 +266,30 @@ fn ci_gcc_root(config: &crate::Config) -> PathBuf {
266266

267267
/// This retrieves the GCC sha we *want* to use, according to git history.
268268
#[cfg(not(test))]
269-
fn detect_gcc_sha(config: &crate::Config, is_git: bool) -> String {
270-
use build_helper::git::get_closest_merge_commit;
271-
272-
let gcc_sha = if is_git {
273-
get_closest_merge_commit(
274-
Some(&config.src),
275-
&config.git_config(),
276-
&[config.src.join("src/gcc"), config.src.join("src/bootstrap/download-ci-gcc-stamp")],
277-
)
278-
.unwrap()
279-
} else if let Some(info) = crate::utils::channel::read_commit_info_file(&config.src) {
280-
info.sha.trim().to_owned()
281-
} else {
282-
"".to_owned()
283-
};
284-
285-
if gcc_sha.is_empty() {
286-
eprintln!("error: could not find commit hash for downloading GCC");
287-
eprintln!("HELP: maybe your repository history is too shallow?");
288-
eprintln!("HELP: consider disabling `download-ci-gcc`");
289-
eprintln!("HELP: or fetch enough history to include one upstream commit");
290-
panic!();
291-
}
292-
293-
gcc_sha
269+
fn detect_gcc_sha(_config: &crate::Config, _is_git: bool) -> String {
270+
"fb4237bc14be8ce17d45c5221b52c3e792546032".to_string()
271+
// use build_helper::git::get_closest_merge_commit;
272+
//
273+
// let gcc_sha = if is_git {
274+
// get_closest_merge_commit(
275+
// Some(&config.src),
276+
// &config.git_config(),
277+
// &[config.src.join("src/gcc"), config.src.join("src/bootstrap/download-ci-gcc-stamp")],
278+
// )
279+
// .unwrap()
280+
// } else if let Some(info) = crate::utils::channel::read_commit_info_file(&config.src) {
281+
// info.sha.trim().to_owned()
282+
// } else {
283+
// "".to_owned()
284+
// };
285+
//
286+
// if gcc_sha.is_empty() {
287+
// eprintln!("error: could not find commit hash for downloading GCC");
288+
// eprintln!("HELP: maybe your repository history is too shallow?");
289+
// eprintln!("HELP: consider disabling `download-ci-gcc`");
290+
// eprintln!("HELP: or fetch enough history to include one upstream commit");
291+
// panic!();
292+
// }
293+
//
294+
// gcc_sha
294295
}

0 commit comments

Comments
 (0)