Skip to content

Commit

Permalink
Rollup merge of #108963 - jhheider:fix-CI-non-git-builds, r=albertlar…
Browse files Browse the repository at this point in the history
…san68

only call git on git checkouts during bootstrap

fixes #108959
  • Loading branch information
matthiaskrgr authored Mar 10, 2023
2 parents 671339c + 54e5c19 commit 7918df5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ pub(crate) fn is_ci_llvm_available(config: &Config, asserts: bool) -> bool {

/// Returns true if we're running in CI with modified LLVM (and thus can't download it)
pub(crate) fn is_ci_llvm_modified(config: &Config) -> bool {
CiEnv::is_ci() && {
CiEnv::is_ci() && config.rust_info.is_managed_git_subrepository() && {
// We assume we have access to git, so it's okay to unconditionally pass
// `true` here.
let llvm_sha = detect_llvm_sha(config, true);
Expand Down

0 comments on commit 7918df5

Please sign in to comment.