Hopefully fix build on x86 linux

Author: rzikm

src/native/external/zstd.cmake

@@ -5,6 +5,7 @@ include(FetchContent)
 FetchContent_Declare(
     zstd
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/zstd/build/cmake
+    EXCLUDE_FROM_ALL
 )
 
 set(ZSTD_BUILD_PROGRAMS OFF)

src/native/libs/System.IO.Compression.Native/CMakeLists.txt

@@ -27,7 +27,7 @@ endif()
 if (STATIC_LIBS_ONLY)
     # For every vendored library that we're actually vendoring (and not referencing the system one)
     # mark it as "no interprocedural optimization" so that it's compatible with our NativeAOT shipping story.
-    foreach(VENDORED_LIB IN LISTS BROTLI_LIBRARIES ITEMS libzstd_static zlib)
+    foreach(VENDORED_LIB IN LISTS BROTLI_LIBRARIES ITEMS libzstd zlib)
         if (TARGET ${VENDORED_LIB})
             set_target_properties(${VENDORED_LIB} PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF)
         endif()
@@ -79,7 +79,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
         target_include_directories(System.IO.Compression.Native PRIVATE ${BROTLI_INCLUDE_DIRS})
         target_link_libraries(System.IO.Compression.Native PRIVATE ${BROTLI_LIBRARIES})
 
-        target_link_libraries(System.IO.Compression.Native PRIVATE libzstd_static)
+        target_link_libraries(System.IO.Compression.Native PRIVATE libzstd)
 
         if (NOT CLR_CMAKE_TARGET_ARCH_WASM AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_USE_SYSTEM_BROTLI)
             set(DEF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/System.IO.Compression.Native_unixexports.src)
@@ -116,7 +116,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
     endif()
 
     if (NOT CLR_CMAKE_USE_SYSTEM_ZSTD)
-        target_link_libraries(System.IO.Compression.Native-Static PUBLIC libzstd_static)
+        target_link_libraries(System.IO.Compression.Native-Static PUBLIC libzstd)
     endif()
 
     set_target_properties(System.IO.Compression.Native-Static PROPERTIES OUTPUT_NAME System.IO.Compression.Native CLEAN_DIRECT_OUTPUT 1)
@@ -140,15 +140,15 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
     endif()
 
     if (NOT CLR_CMAKE_USE_SYSTEM_ZSTD)
-        install (TARGETS libzstd_static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
+        install (TARGETS libzstd DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
     endif()
 
     if (NOT CLR_CMAKE_USE_SYSTEM_ZLIB)
         install (TARGETS zlib DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
     endif()
     if (CLR_CMAKE_TARGET_ARCH_WASM)
         install (TARGETS zlib DESTINATION sharedFramework COMPONENT runtime)
-        install (TARGETS libzstd_static DESTINATION sharedFramework COMPONENT runtime)
+        install (TARGETS libzstd DESTINATION sharedFramework COMPONENT runtime)
     endif()
 else ()
     set(NATIVE_LIBS_EXTRA)
@@ -172,7 +172,7 @@ else ()
         endif()
 
         if (NOT CLR_CMAKE_USE_SYSTEM_ZSTD)
-            target_link_libraries(System.IO.Compression.Native PUBLIC libzstd_static)
+            target_link_libraries(System.IO.Compression.Native PUBLIC libzstd)
         endif()
 
         target_include_directories(System.IO.Compression.Native PUBLIC ${BROTLI_INCLUDE_DIRS})
@@ -193,7 +193,7 @@ else ()
     endif()
 
     if (NOT CLR_CMAKE_USE_SYSTEM_ZSTD)
-        target_link_libraries(System.IO.Compression.Native-Static PUBLIC libzstd_static)
+        target_link_libraries(System.IO.Compression.Native-Static PUBLIC libzstd)
     endif()
 
     target_include_directories(System.IO.Compression.Native-Static PUBLIC ${BROTLI_INCLUDE_DIRS})
@@ -210,7 +210,7 @@ else ()
         endif()
 
         if (NOT CLR_CMAKE_USE_SYSTEM_ZSTD)
-            target_link_libraries(System.IO.Compression.Native.Aot PUBLIC libzstd_static)
+            target_link_libraries(System.IO.Compression.Native.Aot PUBLIC libzstd)
         endif()
 
         target_include_directories(System.IO.Compression.Native.Aot PUBLIC ${BROTLI_INCLUDE_DIRS})
@@ -244,7 +244,7 @@ else ()
             install_static_library(zlib aotsdk nativeaot)
         endif()
         if (NOT CLR_CMAKE_USE_SYSTEM_ZSTD)
-            install_static_library(libzstd_static aotsdk nativeaot)
+            install_static_library(libzstd aotsdk nativeaot)
         endif()
     endif()