Skip to content

Commit 134fcc8

Browse files
committed
add git_info function and invoke from parse_inner
1 parent 7eb8f60 commit 134fcc8

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -893,21 +893,25 @@ impl Config {
893893
let default = config.channel == "dev";
894894
config.omit_git_hash = rust_omit_git_hash.unwrap_or(default);
895895

896-
config.rust_info = config.git_info(config.omit_git_hash, &config.src);
896+
config.rust_info = git_info(&config.exec_ctx, config.omit_git_hash, &config.src);
897897
config.cargo_info =
898-
config.git_info(config.omit_git_hash, &config.src.join("src/tools/cargo"));
899-
config.rust_analyzer_info =
900-
config.git_info(config.omit_git_hash, &config.src.join("src/tools/rust-analyzer"));
898+
git_info(&config.exec_ctx, config.omit_git_hash, &config.src.join("src/tools/cargo"));
899+
config.rust_analyzer_info = git_info(
900+
&config.exec_ctx,
901+
config.omit_git_hash,
902+
&config.src.join("src/tools/rust-analyzer"),
903+
);
901904
config.clippy_info =
902-
config.git_info(config.omit_git_hash, &config.src.join("src/tools/clippy"));
905+
git_info(&config.exec_ctx, config.omit_git_hash, &config.src.join("src/tools/clippy"));
903906
config.miri_info =
904-
config.git_info(config.omit_git_hash, &config.src.join("src/tools/miri"));
907+
git_info(&config.exec_ctx, config.omit_git_hash, &config.src.join("src/tools/miri"));
905908
config.rustfmt_info =
906-
config.git_info(config.omit_git_hash, &config.src.join("src/tools/rustfmt"));
909+
git_info(&config.exec_ctx, config.omit_git_hash, &config.src.join("src/tools/rustfmt"));
907910
config.enzyme_info =
908-
config.git_info(config.omit_git_hash, &config.src.join("src/tools/enzyme"));
909-
config.in_tree_llvm_info = config.git_info(false, &config.src.join("src/llvm-project"));
910-
config.in_tree_gcc_info = config.git_info(false, &config.src.join("src/gcc"));
911+
git_info(&config.exec_ctx, config.omit_git_hash, &config.src.join("src/tools/enzyme"));
912+
config.in_tree_llvm_info =
913+
git_info(&config.exec_ctx, false, &config.src.join("src/llvm-project"));
914+
config.in_tree_gcc_info = git_info(&config.exec_ctx, false, &config.src.join("src/gcc"));
911915

912916
config.vendor = build_vendor.unwrap_or(
913917
config.rust_info.is_from_tarball()

0 commit comments

Comments
 (0)