diff mbox series

meson: fix dependencies for modinfo #2

Message ID 20210723120156.1183920-1-kraxel@redhat.com
State New
Headers show
Series meson: fix dependencies for modinfo #2 | expand

Commit Message

Gerd Hoffmann July 23, 2021, 12:01 p.m. UTC 
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 <kraxel@redhat.com>
---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index df5094e563e9..f2e148eaf98e 100644
--- a/meson.build
+++ b/meson.build
@@ -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