Consume libraries that we vendor fully by building separately and using a custom prefix path

eng/DotNetBuild.props

@@ -86,6 +86,7 @@
       <InnerBuildArgs Condition="$(UseSystemLibs.Contains('+rapidjson'))">$(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_RAPIDJSON=true</InnerBuildArgs>
       <InnerBuildArgs Condition="$(UseSystemLibs.Contains('+zlib'))">$(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_ZLIB=true</InnerBuildArgs>
       <InnerBuildArgs Condition="$(UseSystemLibs.Contains('-lttng'))">$(InnerBuildArgs) /p:FeatureXplatEventSource=false</InnerBuildArgs>
+      <InnerBuildArgs Condition="'$(UseSystemLibs)' != ''">$(InnerBuildArgs) /p:UseSystemLibs=$(UseSystemLibs)</InnerBuildArgs>
 
       <!-- Needed until https://github.com/dotnet/runtime/issues/109329 is fixed. -->
       <InnerBuildArgs Condition="'$(NetCoreAppToolCurrentVersion)' != ''">$(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion)</InnerBuildArgs>

eng/liveBuilds.targets

@@ -18,6 +18,7 @@
     <MonoArtifactsPath Condition="'$(MonoArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'mono', '$(TargetOS).$(TargetArchitecture).$(MonoConfiguration)'))</MonoArtifactsPath>
     <LibrariesArtifactsPath Condition="'$(LibrariesArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</LibrariesArtifactsPath>
     <LibrariesAllConfigurationsArtifactsPath Condition="'$(LibrariesAllConfigurationsArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</LibrariesAllConfigurationsArtifactsPath>
+    <VendoredLibraryRootPath>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'external', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</VendoredLibraryRootPath>
   </PropertyGroup>
 
   <!-- Set up artifact subpaths. -->

eng/native/configureplatform.cmake

@@ -519,10 +519,15 @@ if (CLR_CMAKE_TARGET_ANDROID OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET
     # Some platforms are opted-out from using the in-tree zlib-ng by default:
     # - Android and iOS-like platforms: concerns about extra binary size
     # - Armv6: zlib-ng has build breaks
+    # Keep in sync with the conditions in src/native/external/vendored-libs.proj
     set(CLR_CMAKE_USE_SYSTEM_ZLIB 1)
 endif()
 
 if (NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_BROWSER)
     # opt into building tools like ildasm/ilasm
     set(CLR_CMAKE_BUILD_TOOLS 1)
 endif()
+
+if (CLR_CMAKE_TARGET_UNIX)
+    list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+endif()

eng/native/gen-buildsys.cmd

@@ -138,7 +138,7 @@ if not "%__ConfigureOnly%" == "1" (
 if /i "%__UseEmcmake%" == "1" (
     call "!EMSDK_PATH!/emsdk_env.cmd" > nul 2>&1 && emcmake "%CMakePath%" %__ExtraCmakeParams% --no-warn-unused-cli -G "%__CmakeGenerator%" -B %__IntermediatesDir% -S %__SourceDir%
 ) else (
-    echo "%CMakePath% %__ExtraCmakeParams% --no-warn-unused-cli -G %__CmakeGenerator% -B %__IntermediatesDir% -S %__SourceDir%"
+    echo %CMakePath% %__ExtraCmakeParams% --no-warn-unused-cli -G %__CmakeGenerator% -B %__IntermediatesDir% -S %__SourceDir%
     "%CMakePath%" %__ExtraCmakeParams% --no-warn-unused-cli -G "%__CmakeGenerator%" -B %__IntermediatesDir% -S %__SourceDir%
 )
 

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets

@@ -46,10 +46,10 @@ The .NET Foundation licenses this file to you under the MIT license.
       <NativeLibrary Condition="'$(IlcMultiModule)' == 'true'" Include="$(SharedLibrary)" />
       <NativeLibrary Include="$(IlcSdkPath)$(StandaloneGCSupportName)$(LibrarySuffix)" />
       <NativeLibrary Include="$(IlcSdkPath)aotminipal$(LibFileExt)" />
-      <NativeLibrary Include="$(IlcSdkPath)zlibstatic$(LibFileExt)" />
-      <NativeLibrary Include="$(IlcSdkPath)brotlicommon$(LibFileExt)" />
-      <NativeLibrary Include="$(IlcSdkPath)brotlienc$(LibFileExt)" />
-      <NativeLibrary Include="$(IlcSdkPath)brotlidec$(LibFileExt)" />
+      <NativeLibrary Include="$(IlcFrameworkNativePath)zlibstatic$(LibFileExt)" />
+      <NativeLibrary Include="$(IlcFrameworkNativePath)brotlicommon$(LibFileExt)" />
+      <NativeLibrary Include="$(IlcFrameworkNativePath)brotlienc$(LibFileExt)" />
+      <NativeLibrary Include="$(IlcFrameworkNativePath)brotlidec$(LibFileExt)" />
     </ItemGroup>
 
     <ItemGroup>

src/coreclr/runtime-prereqs.proj

@@ -14,9 +14,9 @@
   <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
 
   <Target Name="BuildPrereqs" BeforeTargets="Build" DependsOnTargets="GenerateRuntimeVersionFile;GenerateNativeSourcelinkFile" />
-  
-  <!-- 
-    This is a workaround when cross-compiling on Windows for Android. 
+
+  <!--
+    This is a workaround when cross-compiling on Windows for Android.
 
     https://github.com/dotnet/arcade/issues/15496
   -->

src/coreclr/runtime.proj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <_BuildNativeTargetOS>$(TargetOS)</_BuildNativeTargetOS>
     <_BuildNativeTargetOS Condition="'$(TargetsLinuxBionic)' == 'true'">linux-bionic</_BuildNativeTargetOS>
-    <HasCdacBuildTool Condition="'$(ClrFullNativeBuild)' == 'true' or '$(ClrRuntimeSubset)' == 'true' or '$(ClrDebugSubset)' == 'true' or '$(ClrCrossComponentsSubset)' == 'true'">true</HasCdacBuildTool>
+    <HasCdacBuildTool Condition="'$(ClrFullNativeBuild)' == 'true' or '$(ClrRuntimeSubset)' == 'true' or '$(ClrDebugSubset)' == 'true'">true</HasCdacBuildTool>
     <_IcuDir Condition="'$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)' != '' and '$(TargetsBrowser)' == 'true'">$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/$(TargetOS)-$(TargetArchitecture)$(_RuntimeVariant)/native</_IcuDir>
   </PropertyGroup>
 
@@ -13,6 +13,14 @@
     <PackageReference Condition="'$(TargetsBrowser)' == 'true'" Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(HostCrossOS)' == ''">
+    <ProjectReference Include="$(RepoRoot)/src/native/external/vendored-libs.proj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <_CMakeArgs Include="-DCMAKE_PREFIX_PATH=$(VendoredLibraryRootPath.TrimEnd('\\'))" />
+  </ItemGroup>
+
   <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
 
   <Target Name="BuildRuntime"
@@ -79,7 +87,6 @@
       <_CoreClrBuildArg Condition="'$(ClrILToolsSubset)' == 'true'" Include="-component iltools" />
       <_CoreClrBuildArg Condition="'$(ClrNativeAotSubset)' == 'true'" Include="-component nativeaot" />
       <_CoreClrBuildArg Condition="'$(ClrSpmiSubset)' == 'true'" Include="-component spmi" />
-      <_CoreClrBuildArg Condition="'$(ClrCrossComponentsSubset)' == 'true'" Include="-component crosscomponents" />
       <_CoreClrBuildArg Condition="'$(ClrDebugSubset)' == 'true'" Include="-component debug" />
       <_CoreClrBuildArg Condition="'$(ClrCdacSubset)' == 'true'" Include= "-component cdac" />
     </ItemGroup>
@@ -116,7 +123,7 @@
 
     <!-- Use IgnoreStandardErrorWarningFormat because Arcade sets WarnAsError and we want to avoid upgrading compiler warnings to errors in release branches -->
     <Message Text="Executing $(_CoreClrBuildPreSource)$(MSBuildThisFileDirectory)&quot;$(MSBuildThisFileDirectory)$(_CoreClrBuildScript)&quot; @(_CoreClrBuildArg->'%(Identity)',' ')" Importance="High" />
     <Exec Command="$(_CoreClrBuildPreSource)$(MSBuildThisFileDirectory)&quot;$(_CoreClrBuildScript)&quot; @(_CoreClrBuildArg->'%(Identity)',' ')"
           IgnoreStandardErrorWarningFormat="true" />
   </Target>
 

src/libraries/native-binplace.proj

@@ -31,6 +31,24 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="GetNoIPODependencies" BeforeTargets="GetBinPlaceItems">
+    <ItemGroup>
+      <NoIPOLib Include="$(VendoredLibraryRootPath)\NOIPO\lib\$(LibPrefix)brotlienc$(StaticLibSuffix);
+              $(VendoredLibraryRootPath)\NOIPO\lib\$(LibPrefix)brotlidec$(StaticLibSuffix);
+              $(VendoredLibraryRootPath)\NOIPO\lib\$(LibPrefix)brotlicommon$(StaticLibSuffix)" />
+      <NoIPOLib Condition="'$(TargetsWindows)' != 'true'" Include="$(VendoredLibraryRootPath)\NOIPO\lib\$(LibPrefix)z$(StaticLibSuffix)" />
+      <NoIPOLib Condition="'$(TargetsWindows)' == 'true'" Include="$(VendoredLibraryRootPath)\NOIPO\lib\$(LibPrefix)zlibstatic$(StaticLibSuffix)" />
+      <NoIPOLib Condition="'$(TargetsWindows)' == 'true'"
+                 Include="$(VendoredLibraryRootPath)\NOIPO\lib\$(LibPrefix)zlibstaticd$(StaticLibSuffix)"
+                 TargetPath="$(RuntimeBinDir)\aotsdk\$(LibPrefix)zlibstatic$(StaticLibSuffix)" />
+    </ItemGroup>
+    <!-- Some of the libraries above may not be produced depending on what system libs (as compared to vendored libs) the build has requested. -->
+    <ItemGroup>
+      <BinPlaceItem Include="@(NoIPOLib)"
+                 Condition="Exists('%(NoIPOLib.Identity)')" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="Build" DependsOnTargets="BinPlace" />
   <Target Name="CreateManifestResourceNames" />
 </Project>

src/mono/CMakeLists.txt

@@ -503,14 +503,8 @@ endif()
 
 # Decide if we need zlib-ng.
 if(NOT DISABLE_EMBEDDED_PDB OR NOT DISABLE_LOG_PROFILER_GZ)
-  if (CLR_CMAKE_USE_SYSTEM_ZLIB)
-    # if we're not on a platform where we use the in-tree zlib-ng, require system zlib
-    include(${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native/extra_libs.cmake)
-    set(Z_LIBS)
-    append_extra_compression_libs(Z_LIBS)
-  else()
-    include(${CLR_SRC_NATIVE_DIR}/external/zlib-ng.cmake)
-  endif()
+    find_package(ZLIB REQUIRED)
+    set (Z_LIBS ZLIB::ZLIB)
 endif()
 
 ######################################

src/mono/mono.proj

@@ -118,6 +118,10 @@
                       GeneratePathProperty="true" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/native/external/vendored-libs.proj" />
+  </ItemGroup>
+
   <!--
     Like Wasm, Wasi needs a 64-bit python on windows to pinvoke into libClang.dll for offset generation.
     Only wasi doesn't come with its own python and windows uses 32-bit python, so refer to the transport pack instead.
@@ -422,6 +426,7 @@
       <_MonoCMakeArgs Include="-DGC_SUSPEND=$(MonoThreadSuspend)" />
       <_MonoCMakeArgs Include="-DMONO_LIB_NAME=$(MonoLibName)" />
       <_MonoCMakeArgs Include="-DMONO_SHARED_LIB_NAME=$(MonoSharedLibName)" />
+      <_MonoCMakeArgs Include="-DCMAKE_PREFIX_PATH=$(VendoredLibraryRootPath.TrimEnd('\\'))" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(HostOS)' == 'Linux' and '$(MonoEnableLLVM)' == 'true' and '$(TargetArchitecture)' != 'wasm' and '$(MonoUseLibCxx)' == 'true'">
@@ -774,7 +779,7 @@
     </PropertyGroup>
     <Message Condition="'$(_MonoSkipCMakeConfigure)' == 'true'" Text="The CMake command line is the same as the last run. Skipping running CMake configure." Importance="High"/>
     <Message Condition="'$(_MonoSkipCMakeConfigure)' != 'true'" Text="Running '$(_MonoCMakeConfigureCommand)' in '$(MonoObjDir)'" Importance="High"/>
     <Exec Condition="'$(_MonoSkipCMakeConfigure)' != 'true'" Command="$(_MonoCMakeConfigureCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
     <WriteLinesToFile
       Condition="'$(_MonoSkipCMakeConfigure)' != 'true'"
       File="$(MonoObjDir)cmake_cmd_line.txt"
@@ -795,6 +800,10 @@
       <AotHostOS Condition="'$(AotHostOS)' == ''">$(HostOS)</AotHostOS>
     </PropertyGroup>
 
+    <ItemGroup>
+      <MonoAOTCMakeArgs Include="-DCMAKE_PREFIX_PATH=$(VendoredLibraryRootPath.TrimEnd('\\'))" />
+    </ItemGroup>
+
     <!-- iOS/tvOS specific options -->
     <PropertyGroup Condition="'$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true'">
       <!-- FIXME: Disable for simulator -->
@@ -1017,7 +1026,7 @@
     </PropertyGroup>
     <Message Condition="'$(_MonoSkipAotCMakeConfigure)' == 'true'" Text="The AOT Cross CMake command line is the same as the last run. Skipping running CMake configure." Importance="High"/>
     <Message Condition="'$(_MonoSkipAotCMakeConfigure)' != 'true'" Text="Running '$(_MonoAotCMakeConfigureCommand)' in '$(MonoObjCrossDir)'" Importance="High"/>
     <Exec Condition="'$(_MonoSkipAotCMakeConfigure)' != 'true'" Command="$(_MonoAotCMakeConfigureCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjCrossDir)"/>
     <WriteLinesToFile
       Condition="'$(_MonoSkipAotCMakeConfigure)' != 'true'"
       File="$(MonoObjCrossDir)cmake_cmd_line.txt"
@@ -1026,7 +1035,7 @@
 
     <!-- build -->
     <Message Text="Running '$(_MonoAotCMakeBuildCommand)' in '$(MonoObjCrossDir)'" Importance="High" />
     <Exec Condition="'$(MonoGenerateOffsetsOSGroups)' == ''" Command="$(_MonoAotCMakeBuildCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjCrossDir)"/>
   </Target>
 
   <PropertyGroup>

src/mono/mono/eventpipe/test/CMakeLists.txt

@@ -41,12 +41,7 @@ if(ENABLE_PERFTRACING)
         target_sources(ep-test PRIVATE "${mono-components-objects}")
 
         set(EPTEST_LINKABLE_LIBS "")
-        list(APPEND EPTEST_LINKABLE_LIBS eglib_api monosgen-static ${OS_LIBS} ${LLVM_LIBS} monoapi)
-        if (CLR_CMAKE_USE_SYSTEM_ZLIB)
-            list(APPEND EPTEST_LINKABLE_LIBS ${EPTEST_LINKABLE_LIBS} ${Z_LIBS})
-        else()
-            list(APPEND EPTEST_LINKABLE_LIBS ${EPTEST_LINKABLE_LIBS} zlib)
-        endif()
+        list(APPEND EPTEST_LINKABLE_LIBS eglib_api monosgen-static ${OS_LIBS} ${LLVM_LIBS} monoapi ${Z_LIBS})
         target_link_libraries(ep-test PRIVATE ${EPTEST_LINKABLE_LIBS})
 
         install_with_stripped_symbols(ep-test TARGETS bin)

src/mono/mono/metadata/CMakeLists.txt

@@ -203,9 +203,6 @@ if(HOST_WIN32 AND NOT DISABLE_SHARED_LIBS)
 
     set(METADATAOBJECTSSHARED_LINKABLE_LIBS "")
     list(APPEND METADATAOBJECTSSHARED_LINKABLE_LIBS monoapi eglib_api utils_objects_shared)
-    if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
-        list(APPEND METADATAOBJECTSSHARED_LINKABLE_LIBS zlib)
-    endif()
     target_link_libraries(metadata_objects_shared PRIVATE ${METADATAOBJECTSSHARED_LINKABLE_LIBS})
 
     # note: metadata_objects is an object library, so this doesn't force linking with sgen,
@@ -222,9 +219,6 @@ target_compile_definitions(metadata_objects PRIVATE ${metadata_compile_definitio
 
 set(METADATAOBJECTS_LINKABLE_LIBS "")
 list(APPEND METADATAOBJECTS_LINKABLE_LIBS monoapi eglib_api utils_objects)
-if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
-    list(APPEND METADATAOBJECTS_LINKABLE_LIBS zlib)
-endif()
 target_link_libraries(metadata_objects PRIVATE ${METADATAOBJECTS_LINKABLE_LIBS})
 
 # note: metadata_objects is an object library, so this doesn't force linking with sgen,

src/mono/mono/mini/CMakeLists.txt

@@ -326,9 +326,6 @@ add_library(monosgen-objects OBJECT "${monosgen-sources}")
 
 set(MONOSGEN_OBJECTS_LINKABLE_LIBS "")
 list(APPEND MONOSGEN_OBJECTS_LINKABLE_LIBS monoapi eglib_api utils_objects sgen_objects metadata_objects)
-if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
-  list(APPEND MONOSGEN_OBJECTS_LINKABLE_LIBS zlib)
-endif()
 target_link_libraries (monosgen-objects PRIVATE ${MONOSGEN_OBJECTS_LINKABLE_LIBS})
 
 if(NOT HOST_WIN32)
@@ -365,9 +362,6 @@ if(NOT DISABLE_SHARED_LIBS)
 
   set(MONOSGENSHARED_LINKABLE_LIBS "")
   list(APPEND MONOSGENSHARED_LINKABLE_LIBS monoapi eglib_objects dn-containers)
-  if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
-    list(APPEND MONOSGENSHARED_LINKABLE_LIBS zlib)
-  endif()
   if(HOST_WIN32)
     list(APPEND MONOSGENSHARED_LINKABLE_LIBS utils_objects_shared sgen_objects_shared metadata_objects_shared minipal)
     target_link_libraries(monosgen-shared PRIVATE ${MONOSGENSHARED_LINKABLE_LIBS})
@@ -383,12 +377,7 @@ if(NOT DISABLE_SHARED_LIBS)
   endif()
 
   set(MONOSGENSHARED_LINKABLE_EXTRALIBS "")
-  list(APPEND MONOSGENSHARED_LINKABLE_EXTRALIBS ${OS_LIBS} ${LLVM_LIBS})
-  if (CLR_CMAKE_USE_SYSTEM_ZLIB)
-    list(APPEND MONOSGENSHARED_LINKABLE_EXTRALIBS ${Z_LIBS})
-  else()
-    list(APPEND MONOSGENSHARED_LINKABLE_EXTRALIBS zlib)
-  endif()
+  list(APPEND MONOSGENSHARED_LINKABLE_EXTRALIBS ${OS_LIBS} ${LLVM_LIBS} ${Z_LIBS})
   target_link_libraries(monosgen-shared PRIVATE ${MONOSGENSHARED_LINKABLE_EXTRALIBS})
 
   if(TARGET_DARWIN)
@@ -437,18 +426,10 @@ if(NOT DISABLE_SHARED_LIBS)
 
         set(FRAMEWORKCONFIG_LINKABLE_LIBS "")
         list(APPEND FRAMEWORKCONFIG_LINKABLE_LIBS monoapi eglib_objects utils_objects sgen_objects metadata_objects dn-containers minipal)
-        if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
-          list(APPEND FRAMEWORKCONFIG_LINKABLE_LIBS zlib)
-        endif()
         target_link_libraries(${frameworkconfig} PRIVATE ${FRAMEWORKCONFIG_LINKABLE_LIBS})
 
         set(FRAMEWORKCONFIG_LINKABLE_EXTRALIBS "")
-        list(APPEND FRAMEWORKCONFIG_LINKABLE_EXTRALIBS ${OS_LIBS} ${LLVM_LIBS})
-        if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
-          list(APPEND FRAMEWORKCONFIG_LINKABLE_EXTRALIBS zlib)
-        else()
-          list(APPEND FRAMEWORKCONFIG_LINKABLE_EXTRALIBS ${Z_LIBS})
-        endif()
+        list(APPEND FRAMEWORKCONFIG_LINKABLE_EXTRALIBS ${OS_LIBS} ${LLVM_LIBS} ${Z_LIBS})
         target_link_libraries(${frameworkconfig} PRIVATE ${FRAMEWORKCONFIG_LINKABLE_EXTRALIBS})
 
         set_property(TARGET ${frameworkconfig} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-compatibility_version -Wl,2.0 -Wl,-current_version -Wl,2.0")
@@ -568,22 +549,14 @@ if(NOT DISABLE_EXECUTABLES)
 
   set(MONOSGEN_LINKABLE_LIBS "")
   list(APPEND MONOSGEN_LINKABLE_LIBS monoapi eglib_api monosgen-static dn-containers)
-  if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
-    list(APPEND MONOSGEN_LINKABLE_LIBS zlib)
-  endif()
   target_link_libraries(mono-sgen PRIVATE ${MONOSGEN_LINKABLE_LIBS})
 
   if (HOST_WASM)
     target_link_libraries(mono-sgen PRIVATE mono-wasm-nosimd)
   endif()
 
   set(MONOSGEN_LINKABLE_EXTRALIBS "")
-  list(APPEND MONOSGEN_LINKABLE_EXTRALIBS ${OS_LIBS} ${LLVM_LIBS})
-  if (CLR_CMAKE_USE_SYSTEM_ZLIB)
-    list(APPEND MONOSGEN_LINKABLE_EXTRALIBS ${Z_LIBS})
-  else()
-    list(APPEND MONOSGEN_LINKABLE_EXTRALIBS zlib)
-  endif()
+  list(APPEND MONOSGEN_LINKABLE_EXTRALIBS ${OS_LIBS} ${LLVM_LIBS} ${Z_LIBS})
   target_link_libraries(mono-sgen PRIVATE ${MONOSGEN_LINKABLE_EXTRALIBS})
 
   # musl-libc implements ucontext in a different library on s390x

src/mono/mono/profiler/CMakeLists.txt

@@ -27,11 +27,7 @@ if(NOT DISABLE_LIBS)
     install(TARGETS mono-profiler-log-static LIBRARY)
 
     if(NOT DISABLE_LOG_PROFILER_GZ)
-      if (CLR_CMAKE_USE_SYSTEM_ZLIB)
-        target_link_libraries(mono-profiler-log PRIVATE ${Z_LIBS})
-      else()
-        target_link_libraries(mono-profiler-log PRIVATE zlib)
-      endif()
+      target_link_libraries(mono-profiler-log PRIVATE ${Z_LIBS})
     endif()
   endif()
 
@@ -55,11 +51,7 @@ if(NOT DISABLE_LIBS)
     install(TARGETS mono-profiler-log-static LIBRARY)
 
     if(NOT DISABLE_LOG_PROFILER_GZ)
-      if (CLR_CMAKE_USE_SYSTEM_ZLIB)
-        target_link_libraries(mono-profiler-log-static PRIVATE ${Z_LIBS})
-      else()
-        target_link_libraries(mono-profiler-log-static PRIVATE zlib)
-      endif()
+      target_link_libraries(mono-profiler-log-static PRIVATE ${Z_LIBS})
     endif()
   endif()
 endif()

src/native/corehost/apphost/static/CMakeLists.txt

@@ -146,10 +146,6 @@ if(CLR_CMAKE_TARGET_WIN32)
         delayimp.lib
     )
 
-    # additional requirements for System.IO.Compression.Native
-    include(${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native/extra_libs.cmake)
-    append_extra_compression_libs(NATIVE_LIBS)
-
     set(RUNTIMEINFO_LIB runtimeinfo)
 
 else()
@@ -190,10 +186,6 @@ else()
         nativeresourcestring
     )
 
-    # additional requirements for System.IO.Compression.Native
-    include(${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native/extra_libs.cmake)
-    append_extra_compression_libs(NATIVE_LIBS)
-
     if (NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_BROWSER) # no gssapi on tvOS, see https://developer.apple.com/documentation/gss
         # Additional requirements for System.Net.Security.Native
         include(${CLR_SRC_NATIVE_DIR}/libs/System.Net.Security.Native/extra_libs.cmake)

src/native/corehost/build.cmd

@@ -46,6 +46,7 @@ if /i [%1] == [rootDir]     (set __rootDir=%2&&shift&&shift&goto Arg_Loop)
 if /i [%1] == [msbuild] (set __Ninja=0)
 if /i [%1] == [runtimeflavor]  (set __RuntimeFlavor=%2&&shift&&shift&goto Arg_Loop)
 if /i [%1] == [runtimeconfiguration]  (set __RuntimeConfiguration=%2&&shift&&shift&goto Arg_Loop)
+if /i [%1] == [-cmakeargs] (set __ExtraCmakeParams=%__ExtraCmakeParams% %2&shift&shift&goto Arg_Loop)
 if /i [%1] == [-fsanitize] ( set __ExtraCmakeParams=%__ExtraCmakeParams% "-DCLR_CMAKE_ENABLE_SANITIZERS=%2"&&shift&&shift&goto Arg_Loop)
 
 shift