meson: fix dependencies for modinfo
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 21 Jul 2021 16:51:57 +0000 (18:51 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 22 Jul 2021 12:44:47 +0000 (14:44 +0200)
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".

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
meson.build

index 6e4d2d80343e2ecd44716b4122ab920883533e5c..eb85fe8e441df9d196c022176300ed11fa4cfdb2 100644 (file)
@@ -2335,9 +2335,9 @@ foreach d, list : modules
         # https://github.com/mesonbuild/meson/pull/8900
         modinfo_files += custom_target(d + '-' + m + '.modinfo',
                                        output: d + '-' + m + '.modinfo',
-                                       input: module_ss.sources(),
+                                       input: module_ss.sources() + genh,
                                        capture: true,
-                                       command: [modinfo_collect, '@INPUT@'])
+                                       command: [modinfo_collect, module_ss.sources()])
       endif
     else
       if d == 'block'