Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix name of zlib that the linker needs #104904

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Fix name of zlib that the linker needs #104904

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7038c04
Fix name of zlib that the linker needs
omajid Jul 15, 2024
add5b8e
Conditionally use z or zlib depending on CLR_CMAKE_USE_SYSTEM_ZLIB
carlossanlop Jul 15, 2024
95a5938
Remove the android branch, add a comment to explain when z and zlib a…
carlossanlop Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/native/libs/System.IO.Compression.Native/extra_libs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ macro(append_extra_compression_libs NativeLibsExtra)
find_package(ZLIB REQUIRED)
list(APPEND ZLIB_LIBRARIES m)
else()
list(APPEND ZLIB_LIBRARIES zlib)
list(APPEND ZLIB_LIBRARIES z)
endif ()
list(APPEND ${NativeLibsExtra} ${ZLIB_LIBRARIES})

Expand Down