From: Nick Terrell <terrelln@fb.com>
Date: Wed, 5 Jan 2022 00:05:59 +0000 (-0800)
Subject: [meson] Explicitly disable assembly for non clang/gcc copmilers
X-Git-Tag: v1.5.2^2~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2972%2Fhead;p=thirdparty%2Fzstd.git

[meson] Explicitly disable assembly for non clang/gcc copmilers

After merging #2951 I realized that we will want to explicitly disable
assembly when we aren't including the assembly source file. Otherwise,
if some non clang/gcc compiler does support assembly, it would fail to
build.
---

diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build
index 2a8c55fbf..6b0933781 100644
--- a/build/meson/lib/meson.build
+++ b/build/meson/lib/meson.build
@@ -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