Skip to content

Commit

Permalink
meson: fix dependencies for modinfo #2
Browse files Browse the repository at this point in the history
modinfo runs the preprocessor and therefore needs all generated input files
to be there.  The "depends" clause does not work in Meson 0.55.3, so for
now use "input".

Part #2: Update the rule for target-specific modules too.

Signed-off-by: Gerd Hoffmann <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
kraxel authored and bonzini committed Jul 23, 2021
1 parent 7b7ca8e commit 917ddc2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2373,9 +2373,9 @@ foreach d, list : target_modules
# FIXME: Should use sl.extract_all_objects(recursive: true) too.
modinfo_files += custom_target(module_name + '.modinfo',
output: module_name + '.modinfo',
input: target_module_ss.sources(),
input: target_module_ss.sources() + genh,
capture: true,
command: [modinfo_collect, '--target', target, '@INPUT@'])
command: [modinfo_collect, '--target', target, target_module_ss.sources()])
endif
endif
endforeach
Expand Down

0 comments on commit 917ddc2

Please sign in to comment.