From 4d3331c63c1e54d1ce3b53677e266c7931be8a26 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 7 Mar 2024 15:42:50 -0500 Subject: cmzstd: Explicitly disable ASM Our vendored zstd does not include the assembly language file from upstream (huf_decompress_amd64.S), so it's fine to completely disable assembly language. Fixes: #25744 --- Utilities/cmzstd/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Utilities/cmzstd/CMakeLists.txt b/Utilities/cmzstd/CMakeLists.txt index 981e3d5..e8bee76 100644 --- a/Utilities/cmzstd/CMakeLists.txt +++ b/Utilities/cmzstd/CMakeLists.txt @@ -44,7 +44,12 @@ add_library(cmzstd STATIC lib/dictBuilder/zdict.c ) -# BMI2 instructions are not supported in older environments. -set_property(TARGET cmzstd PROPERTY COMPILE_DEFINITIONS DYNAMIC_BMI2=0) +target_compile_definitions(cmzstd PRIVATE + # BMI2 instructions are not supported in older environments. + DYNAMIC_BMI2=0 + # Explicitly disable ASM build to work with more compilers. + # Our vendored zstd does not include the assembly language file. + ZSTD_DISABLE_ASM=1 + ) install(FILES LICENSE DESTINATION ${CMAKE_DOC_DIR}/cmzstd) -- cgit v0.12