Skip to content

Commit

Permalink
Merge pull request #2972 from terrelln/meson-fix
Browse files Browse the repository at this point in the history
[meson] Explicitly disable assembly for non clang/gcc copmilers
  • Loading branch information
terrelln authored Jan 5, 2022
2 parents 3c2c3fb + c4f5116 commit c592b46
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions build/meson/lib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
# 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)
libzstd_sources += join_paths(zstd_rootdir, 'lib/decompress/huf_decompress_amd64.S')
else
add_project_arguments('-DZSTD_DISABLE_ASM', language: 'c')
endif

# Explicit define legacy support
Expand Down

0 comments on commit c592b46

Please sign in to comment.