Don't require cmake on Windows when LLVM isn't being built#85423
Merged
bors merged 1 commit intorust-lang:masterfrom May 18, 2021
Merged
Don't require cmake on Windows when LLVM isn't being built#85423bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Previously, setting `download-ci-llvm = true` when cmake wasn't installed would give the following error: ``` failed to execute command: "cmake" "--help" error: The system cannot find the file specified. (os error 2) ```
jyn514
added
O-windows
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
@bors r+ rollup |
Collaborator
|
📌 Commit 28c9c04 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 18, 2021
Rollup of 7 pull requests Successful merges: - rust-lang#84462 (rustdoc: use focus for search navigation) - rust-lang#85251 (Make `const_generics_defaults` not an incomplete feature) - rust-lang#85404 (Backport 1.52.1 release notes) - rust-lang#85407 (Improve display for "copy-path" button, making it more discreet) - rust-lang#85423 (Don't require cmake on Windows when LLVM isn't being built) - rust-lang#85428 (Add x.py pre-setup instructions) - rust-lang#85442 (fix typo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, setting
download-ci-llvm = truewhen cmake wasn'tinstalled would give the following error: