aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake
diff options
context:
space:
mode:
authorJustin Handville <nanolith@gmail.com>2021-06-20 16:20:04 -0400
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-06-22 12:46:17 +0200
commit9f248c778d6611c6ec4c9850aaee88be44655424 (patch)
treee39f1d5c25d606e118f6cd38c266431c92576f78 /mesonbuild/cmake
parent5cd9f88d6cafbbc2b748ffc85226d53800a05aac (diff)
downloadmeson-9f248c778d6611c6ec4c9850aaee88be44655424.zip
meson-9f248c778d6611c6ec4c9850aaee88be44655424.tar.gz
meson-9f248c778d6611c6ec4c9850aaee88be44655424.tar.bz2
Fix for Issue 8910 (Meson filters CMake asm files)
Diffstat (limited to 'mesonbuild/cmake')
-rw-r--r--mesonbuild/cmake/interpreter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index f79f7d2..745def1 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -24,7 +24,7 @@ from .traceparser import CMakeTraceParser, CMakeGeneratorTarget
from .. import mlog, mesonlib
from ..mesonlib import MachineChoice, OrderedSet, version_compare, path_is_in_root, relative_to_if_possible, OptionKey
from ..mesondata import mesondata
-from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header
+from ..compilers.compilers import assembler_suffixes, lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header
from ..programs import ExternalProgram
from enum import Enum
from functools import lru_cache
@@ -435,7 +435,7 @@ class ConverterTarget:
self.link_libraries = temp
# Filter out files that are not supported by the language
- supported = list(header_suffixes) + list(obj_suffixes)
+ supported = list(assembler_suffixes) + list(header_suffixes) + list(obj_suffixes)
for i in self.languages:
supported += list(lang_suffixes[i])
supported = [f'.{x}' for x in supported]