diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-03-10 12:32:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-10 12:32:02 +0100 |
| commit | 7918df5f57cf455041620ecbc9e100b6bb84b0d7 (patch) | |
| tree | 73234f0a1a5e0b9e312be043ae4853fbb63a5751 /src/bootstrap | |
| parent | 671339cdb00ebb04c8512c5edbfa9dc50fe1a245 (diff) | |
| parent | 54e5c19f087f11ed0a0a88c1f4f34cc8cac574fd (diff) | |
| download | rust-7918df5f57cf455041620ecbc9e100b6bb84b0d7.tar.gz rust-7918df5f57cf455041620ecbc9e100b6bb84b0d7.zip | |
Rollup merge of #108963 - jhheider:fix-CI-non-git-builds, r=albertlarsan68
only call git on git checkouts during bootstrap fixes https://github.com/rust-lang/rust/issues/108959
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 909e7d83a15..7f6d80c91ad 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -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); |