Skip to content

Don't require cmake on Windows when LLVM isn't being built #85423

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
May 18, 2021
Merged

Don't require cmake on Windows when LLVM isn't being built #85423

merged 1 commit into from
May 18, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented May 18, 2021

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
Don't require cmake on Windows when LLVM isn't being built
28c9c04 
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 jyn514 added O-windows Operating system: Windows T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-contributor-roadblock Area: Makes things more difficult for new or seasoned contributors to Rust labels May 18, 2021
@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 18, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 18, 2021

📌 Commit 28c9c04 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 18, 2021
@RalfJung RalfJung mentioned this pull request May 18, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 18, 2021
@bors
Auto merge of rust-lang#85443 - RalfJung:rollup-d9gd64t, r=RalfJung
491cf55 
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
@bors bors merged commit aef6848 into rust-lang:master May 18, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 18, 2021
@jyn514 jyn514 deleted the cmake branch May 18, 2021 21:17
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-contributor-roadblock Area: Makes things more difficult for new or seasoned contributors to Rust O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.54.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jyn514 @rust-highfive @Mark-Simulacrum @bors @rustbot