diff --git a/meson.build b/meson.build index dc7e2b9a7b..7ac331fb36 100644 --- a/meson.build +++ b/meson.build @@ -1887,7 +1887,7 @@ config_h = configure_file( userspace_c_args += ['-include', 'config.h'] -jinja2_cmdline = [meson_render_jinja2, config_h, version_h] +jinja2_cmdline = [meson_render_jinja2, config_h] userspace = declare_dependency( compile_args : userspace_c_args, diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py index 3a3d912d8f..977de79378 100755 --- a/tools/meson-render-jinja2.py +++ b/tools/meson-render-jinja2.py @@ -33,12 +33,11 @@ def render(filename, defines): def main(): defines = parse_config_h(sys.argv[1]) - defines.update(parse_config_h(sys.argv[2])) - output = render(sys.argv[3], defines) - with open(sys.argv[4], 'w') as f: + output = render(sys.argv[2], defines) + with open(sys.argv[3], 'w') as f: f.write(output) - info = os.stat(sys.argv[3]) - os.chmod(sys.argv[4], info.st_mode) + info = os.stat(sys.argv[2]) + os.chmod(sys.argv[3], info.st_mode) if __name__ == '__main__': main()