[release/9.0-preview7] Ensure linux uses zlib-ng and not system ZLIB#105354
Merged
carlossanlop merged 2 commits intorelease/9.0-preview7from Jul 24, 2024
Merged
Conversation
ghost
added
the
Contributor
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure |
carlossanlop
added
the
Servicing-consider
carlossanlop
approved these changes
Jul 23, 2024
carlossanlop
added
Servicing-approved
jkoritzinsky
approved these changes
Jul 23, 2024
Contributor
|
All failures known and unrelated. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
Backport of #105352 to release/9.0-preview7
/cc @carlossanlop @am11
Customer Impact
We needed to add logic to cmake that would decide which zlib version to use depending if the
CLR_CMAKE_USE_SYSTEM_ZLIBvariable was turned on or not. Currently we were always using the in-tree zlib-ng, but there were cases where we needed to turn that variable on via the command line. The fix was to add a generator expression (it's a condition) to select between the system installed zlib and the in-tree zlib-ng. But the condition was malformed, causing us to always select the system installed zlib.The fix is simply to wrap the
CLR_CMAKE_USE_SYSTEM_ZLIBkeyword in the condition with${}so it gets evaluated properly.Regression
It was working fine a few days ago until we introduced a malformed generator expression in cmake.
Testing
Manually verified with the local build.
Risk
Low - The build was working correctly until we introduced a malformed generator expression in cmake.