ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2972 from terrelln/meson-fix

Browse Source 
[meson] Explicitly disable assembly for non clang/gcc copmilers
This commit is contained in:
Nick Terrell
2022-01-05 09:27:33 -08:00
committed by GitHub
parent 3c2c3fbe4a c4f5116e95
commit c592b463ca
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/meson/lib/meson.build
+3
View File
@@ -47,8 +47,11 @@ libzstd_sources = [join_paths(zstd_rootdir, 'lib/common/entropy_common.c'),
# really we need anything that defines __GNUC__ as that is what ZSTD_ASM_SUPPORTED is gated on # really we need anything that defines __GNUC__ as that is what ZSTD_ASM_SUPPORTED is gated on
# but these are the two compilers that are supported in tree and actually handle this correctly # but these are the two compilers that are supported in tree and actually handle this correctly
# Otherwise, explicitly disable assmebly.
if [compiler_gcc, compiler_clang].contains(cc_id) if [compiler_gcc, compiler_clang].contains(cc_id)
libzstd_sources += join_paths(zstd_rootdir, 'lib/decompress/huf_decompress_amd64.S') libzstd_sources += join_paths(zstd_rootdir, 'lib/decompress/huf_decompress_amd64.S')
else
add_project_arguments('-DZSTD_DISABLE_ASM', language: 'c')
endif endif
# Explicit define legacy support # Explicit define legacy support