extract_all_sources: Also include generated object files

Closes #4281.
pull/4394/merge
Xavier Claessens 6 years ago committed by Jussi Pakkanen
parent 4fc1ca20b6
commit f0e1342fb2
  1. 8
      mesonbuild/backend/backends.py
  2. 6
      test cases/nasm/1 configure file/meson.build

@ -443,7 +443,13 @@ class Backend:
sources.append(File(True, dirpart, fnamepart))
# Filter out headers and all non-source files
sources = [s for s in sources if self.environment.is_source(s) and not self.environment.is_header(s)]
filtered_sources = []
for s in sources:
if self.environment.is_source(s) and not self.environment.is_header(s):
filtered_sources.append(s)
elif self.environment.is_object(s):
result.append(s.relative_name())
sources = filtered_sources
# extobj could contain only objects and no sources
if not sources:

@ -47,3 +47,9 @@ exe = executable('hello', asm_gen.process('hello.asm'),
)
test('test-nasm-configure-file', exe)
exe2 = executable('hello2', objects : exe.extract_all_objects(),
link_args: link_args,
)
test('test-nasm-extract-all-objects', exe2)

Loading…
Cancel
Save