From c4f5116e95d7aee1fb36f64ce074fc1187630398 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Tue, 4 Jan 2022 16:05:59 -0800 Subject: [PATCH] [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. --- build/meson/lib/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build index 2a8c55fbf52..6b093378101 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