Skip to content

Commit 183f00c

Browse files
committed
Initialize rust_info before is_ci_llvm_available()
1 parent f4f322c commit 183f00c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/bootstrap/config.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,11 @@ impl Config {
11531153
config.rust_profile_generate = flags.rust_profile_generate;
11541154
}
11551155

1156+
// rust_info must be set before is_ci_llvm_available() is called.
1157+
let default = config.channel == "dev";
1158+
config.ignore_git = ignore_git.unwrap_or(default);
1159+
config.rust_info = GitInfo::new(config.ignore_git, &config.src);
1160+
11561161
if let Some(llvm) = toml.llvm {
11571162
match llvm.ccache {
11581163
Some(StringOrBool::String(ref s)) => config.ccache = Some(s.to_string()),
@@ -1346,10 +1351,6 @@ impl Config {
13461351
config.rust_debuginfo_level_tools = with_defaults(debuginfo_level_tools);
13471352
config.rust_debuginfo_level_tests = debuginfo_level_tests.unwrap_or(0);
13481353

1349-
let default = config.channel == "dev";
1350-
config.ignore_git = ignore_git.unwrap_or(default);
1351-
config.rust_info = GitInfo::new(config.ignore_git, &config.src);
1352-
13531354
let download_rustc = config.download_rustc_commit.is_some();
13541355
// See https://github.com/rust-lang/compiler-team/issues/326
13551356
config.stage = match config.cmd {

0 commit comments

Comments
 (0)