diff options
| author | bors <bors@rust-lang.org> | 2023-03-10 15:39:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-10 15:39:25 +0000 |
| commit | 35a0961bbc8fba75bb863c7835b39d431ad9fc5d (patch) | |
| tree | 70e351dc29992a07c0ce4fd7015e04ed65ed1633 /src/bootstrap | |
| parent | d5833423a02e2373c5e3cceb238fb19192cd82f8 (diff) | |
| parent | df74b70b9ed90f76afecbcb67d061db28bfa8002 (diff) | |
| download | rust-35a0961bbc8fba75bb863c7835b39d431ad9fc5d.tar.gz rust-35a0961bbc8fba75bb863c7835b39d431ad9fc5d.zip | |
Auto merge of #108977 - matthiaskrgr:rollup-1bnl1hu, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #108879 (Unconstrained terms should account for infer vars being equated) - #108936 (Rustdoc: don't hide anonymous reexport) - #108940 (Add myself to compiler reviewers list) - #108945 (Make some report and emit errors take DefIds instead of BodyIds) - #108946 (Document the resulting values produced when using `From<bool>` on floats) - #108956 (Make ptr::from_ref and ptr::from_mut in #106116 const.) - #108960 (Remove `body_def_id` from `Inherited`) - #108963 (only call git on git checkouts during bootstrap) - #108964 (Fix the docs for pointer method with_metadata_of) Failed merges: - #108950 (Directly construct Inherited in typeck.) r? `@ghost` `@rustbot` modify labels: rollup
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); |
