bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Initialize rust_info before is_ci_llvm_available()

Browse source
This commit is contained in:
Nikita Popov 2023-03-11 16:51:33 +01:00 • committed by Nikita Popov
parent f4f322c674
commit 183f00c25e
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bootstrap/config.rs
View file

@ -1153,6 +1153,11 @@ impl Config {
config.rust_profile_generate = flags.rust_profile_generate; config.rust_profile_generate = flags.rust_profile_generate;
} }
// rust_info must be set before is_ci_llvm_available() is called.
let default = config.channel == "dev";
config.ignore_git = ignore_git.unwrap_or(default);
config.rust_info = GitInfo::new(config.ignore_git, &config.src);
if let Some(llvm) = toml.llvm { if let Some(llvm) = toml.llvm {
match llvm.ccache { match llvm.ccache {
Some(StringOrBool::String(ref s)) => config.ccache = Some(s.to_string()), Some(StringOrBool::String(ref s)) => config.ccache = Some(s.to_string()),
@ -1346,10 +1351,6 @@ impl Config {
config.rust_debuginfo_level_tools = with_defaults(debuginfo_level_tools); config.rust_debuginfo_level_tools = with_defaults(debuginfo_level_tools);
config.rust_debuginfo_level_tests = debuginfo_level_tests.unwrap_or(0); config.rust_debuginfo_level_tests = debuginfo_level_tests.unwrap_or(0);
let default = config.channel == "dev";
config.ignore_git = ignore_git.unwrap_or(default);
config.rust_info = GitInfo::new(config.ignore_git, &config.src);
let download_rustc = config.download_rustc_commit.is_some(); let download_rustc = config.download_rustc_commit.is_some();
// See https://github.com/rust-lang/compiler-team/issues/326 // See https://github.com/rust-lang/compiler-team/issues/326
config.stage = match config.cmd { config.stage = match config.cmd {