Skip to content

Install zlib in the IlcFrameworkNative folder instead of alongside the runtime #110378

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

Merged
merged 4 commits into from
Dec 5, 2024
Merged

Install zlib in the IlcFrameworkNative folder instead of alongside the runtime #110378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b03858
Install zlib in the IlcFrameworkNative folder instead of alongside th…
jkoritzinsky Dec 3, 2024
e82defd
Fix check for UseSystemZlib
jkoritzinsky Dec 3, 2024
48fd706
wasm and android fixes
jkoritzinsky Dec 4, 2024
8c14698
Add support for pthreads when building zlib-ng in libraries partition…
jkoritzinsky Dec 5, 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/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ The .NET Foundation licenses this file to you under the MIT license.

<ItemGroup>
<!-- zlib must be added after System.IO.Compression.Native, order matters. -->
<NativeLibrary Condition="'$(UseSystemZlib)' != 'true'" Include="$(IlcSdkPath)libz.a" />
<NativeLibrary Condition="'$(UseSystemZlib)' != 'true'" Include="$(IlcFrameworkNativePath)libz.a" />
</ItemGroup>

<ItemGroup Condition="'$(StaticICULinking)' == 'true' and '$(NativeLib)' != 'Static' and '$(InvariantGlobalization)' != 'true'">
Expand Down
9 changes: 5 additions & 4 deletions src/native/libs/System.IO.Compression.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
endif()

set_target_properties(System.IO.Compression.Native-Static PROPERTIES OUTPUT_NAME System.IO.Compression.Native CLEAN_DIRECT_OUTPUT 1)

install (TARGETS zlib DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
else ()
if (GEN_SHARED_LIB)
include (GenerateExportHeader)
Expand Down Expand Up @@ -163,12 +165,11 @@ else ()
if(STATIC_LIBS_ONLY)
install_static_library(System.IO.Compression.Native.Aot aotsdk nativeaot)
install_static_library(System.IO.Compression.Native.Aot.GuardCF aotsdk nativeaot)
if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
install_static_library(zlib aotsdk nativeaot)
endif()
endif()

endif ()

if((NOT CLR_CMAKE_USE_SYSTEM_ZLIB) AND STATIC_LIBS_ONLY)
install_static_library(zlib aotsdk nativeaot)
endif()

install (TARGETS System.IO.Compression.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
Loading