Do not try to build LLVM with Zlib on Windows #85762
Merged
Conversation
This file contains 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
We do not install Zlib on the CI but recent builds somehow started picking it's shared version. To avoid relying on CI binaries so let's explicitly disable it.
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
This is untested, can I have |
|
@bors try |
|
⌛ Trying commit 0100e7ed0e8ce6f751a48a480d1ac6e5b99eafc4 with merge f0c2c0aa6ba5b8eceb6adf9bd81195452e550cc1... |
|
☀️ Try build successful - checks-actions |
klensy
reviewed
May 28, 2021
| @@ -181,7 +181,7 @@ impl Step for Llvm { | |||
| .define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap()) | |||
| .define("LLVM_DEFAULT_TARGET_TRIPLE", target_native); | |||
|
|
|||
| if target != "aarch64-apple-darwin" { | |||
| if target != "aarch64-apple-darwin" && !target.contains("windows") { | |||
There was a problem hiding this comment.
this will also match other windows targets, for example x86_64-pc-windows-msvc
There was a problem hiding this comment.
Exactly, currently windows-msvc doesn't link Zlib at all but who knows what is going to change within GitHub Actions CI...
|
Okay this worked: For the completeness this is nightly (the error is misleading): |
mati865
force-pushed
the
disable-zlib-on-windows
branch
from
0100e7e to
53bf79e
Compare
|
cc @rylev |
|
Hmm... I'm worried that in the long run this may not be the right fix, in the sense that we should either link in zlib statically or otherwise avoid this. For now it seems OK though. @bors r+ |
|
📌 Commit 53bf79e has been approved by |
bors
added
S-waiting-on-bors
|
The problem with Windows CI is it doesn't use Docker like Linux so building Zlib will slow down everything. Unless we use prebuilt Zlib from MSYS2 which we never did so far. |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
May 30, 2021
…Mark-Simulacrum Do not try to build LLVM with Zlib on Windows Fixes rust-lang#85422 Fixes rust-lang#85624 We do not install Zlib on the CI but recent builds somehow started picking it's shared version. To avoid relying on CI binaries so let's explicitly disable it.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 30, 2021
…laumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#85285 (Add eslint checks to CI) - rust-lang#85709 (Use correct edition when parsing `:pat` matchers) - rust-lang#85762 (Do not try to build LLVM with Zlib on Windows) - rust-lang#85770 (Remove `--print unversioned-files` from rustdoc ) - rust-lang#85781 (Add documentation for aarch64-apple-ios-sim target) - rust-lang#85801 (Add `String::extend_from_within`) - rust-lang#85817 (Fix a typo) - rust-lang#85818 (Don't drop `PResult` without handling the error) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
akoeplinger
added a commit
to dotnet/llvm-project
that referenced
this pull request
Dec 13, 2022
CMake is accidentally picking up zlib from the CI environment, see actions/runner-images#6627 (comment). Disable zlib on Windows since we don't want the dependency there, this is also what Rust did a while back: rust-lang/rust#85762
akoeplinger
added a commit
to dotnet/llvm-project
that referenced
this pull request
Dec 13, 2022
CMake is accidentally picking up zlib from the CI environment, see actions/runner-images#6627 (comment), the build log now has this line: ``` -- Found ZLIB: C:/Strawberry/c/lib/libz.a (found version "1.2.11") ``` Disable zlib on Windows since we don't want the dependency there, this is also what Rust did a while back: rust-lang/rust#85762
akoeplinger
added a commit
to dotnet/llvm-project
that referenced
this pull request
Dec 14, 2022
CMake is accidentally picking up zlib from the CI environment, see actions/runner-images#6627 (comment), the build log now has this line: ``` -- Found ZLIB: C:/Strawberry/c/lib/libz.a (found version "1.2.11") ``` Disable zlib on Windows since we don't want the dependency there, this is also what Rust did a while back: rust-lang/rust#85762 (cherry picked from commit ea445e4)
akoeplinger
added a commit
to dotnet/llvm-project
that referenced
this pull request
Dec 14, 2022
CMake is accidentally picking up zlib from the CI environment, see actions/runner-images#6627 (comment), the build log now has this line: ``` -- Found ZLIB: C:/Strawberry/c/lib/libz.a (found version "1.2.11") ``` Disable zlib on Windows since we don't want the dependency there, this is also what Rust did a while back: rust-lang/rust#85762 (cherry picked from commit ea445e4)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #85422
Fixes #85624
We do not install Zlib on the CI but recent builds somehow started picking it's shared version.
To avoid relying on CI binaries so let's explicitly disable it.