Bug 1828577 - Properly set *-stl-wrapper.template.h as an input to the make-stl-wrappers script. r=firefox-build-system-reviewers,ahochheiden

Differential Revision: https://phabricator.services.mozilla.com/D175734

config/make-stl-wrappers.py

@@ -10,7 +10,7 @@ from mozbuild.util import FileAvoidWrite
 # generate all the files in header_list
 
 
-def gen_wrappers(unused, outdir, compiler, template_file, *header_list):
+def gen_wrappers(unused, template_file, outdir, compiler, *header_list):
     template = open(template_file, "r").read()
 
     for header in header_list:

config/moz.build

@@ -49,7 +49,7 @@ if CONFIG["WRAP_STL_INCLUDES"]:
         # containing generated files; if this is changed here then the code in
         # GeneratedFile.__init__ in python/mozbuild/mozbuild/frontend/data.py
         # might need to be updated accordingly as well.
-        template_file = SRCDIR + "/%s-stl-wrapper.template.h" % stl_compiler
+        template_file = "%s-stl-wrapper.template.h" % stl_compiler
         output_dir = "/dist/stl_wrappers"
         # We have to use a sentinel file as the first file because the
         # file_generate action will create it for us, but we want to create all
@@ -61,7 +61,8 @@ if CONFIG["WRAP_STL_INCLUDES"]:
             *outputs,
             script="make-stl-wrappers.py",
             entry_point="gen_wrappers",
-            flags=[TOPOBJDIR + output_dir, stl_compiler, template_file] + stl_headers
+            inputs=[template_file],
+            flags=[TOPOBJDIR + output_dir, stl_compiler] + stl_headers
         )
 
     # Wrap <windows.h> to make it easier to use correctly