gh-103963: fix 'make regen-opcode' in out-of-tree builds (#104177)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index b285ef9e832db54930c50da81359e8bdb7bfaea6..736a520d0e8fb64a95ce9f3e935fdd4e6e3dae13 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1376,9 +1376,11 @@ regen-opcode:
        $(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/generate_opcode_h.py \
                $(srcdir)/Lib/opcode.py \
                $(srcdir)/Include/opcode.h.new \
-               $(srcdir)/Include/internal/pycore_opcode.h.new
+               $(srcdir)/Include/internal/pycore_opcode.h.new \
+               $(srcdir)/Include/internal/pycore_intrinsics.h.new
        $(UPDATE_FILE) $(srcdir)/Include/opcode.h $(srcdir)/Include/opcode.h.new
        $(UPDATE_FILE) $(srcdir)/Include/internal/pycore_opcode.h $(srcdir)/Include/internal/pycore_opcode.h.new
+       $(UPDATE_FILE) $(srcdir)/Include/internal/pycore_intrinsics.h $(srcdir)/Include/internal/pycore_intrinsics.h.new
 
 .PHONY: regen-token
 regen-token:

diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets
index aeb7e2e185d9f88c16ad063c2ca79481edff0e7b..107066817ba6b04e1cd086fc016843d85e06477d 100644 (file)
--- a/PCbuild/regen.targets
+++ b/PCbuild/regen.targets
@@ -59,7 +59,7 @@
           Inputs="@(_OpcodeSources)" Outputs="@(_OpcodeOutputs)"
           DependsOnTargets="FindPythonForBuild">
     <Message Text="Regenerate @(_OpcodeOutputs->'%(Filename)%(Extension)',' ')" Importance="high" />
-    <Exec Command="$(PythonForBuild) Tools\build\generate_opcode_h.py Lib\opcode.py Include\opcode.h Include\internal\pycore_opcode.h"
+    <Exec Command="$(PythonForBuild) Tools\build\generate_opcode_h.py Lib\opcode.py Include\opcode.h Include\internal\pycore_opcode.h Include\internal\pycore_intrinsics.h"
           WorkingDirectory="$(PySourcePath)" />
     <Exec Command="$(PythonForBuild) Python\makeopcodetargets.py Python\opcode_targets.h"
           WorkingDirectory="$(PySourcePath)" />

diff --git a/Tools/build/generate_opcode_h.py b/Tools/build/generate_opcode_h.py
index adcbaf2b8e08bfd22fb328e2953ba0a24faab060..5be981005725bfbf102ee2e4a9b2b97d910136ce 100644 (file)
--- a/Tools/build/generate_opcode_h.py
+++ b/Tools/build/generate_opcode_h.py
@@ -233,4 +233,4 @@ def main(opcode_py, outfile='Include/opcode.h',
 
 
 if __name__ == '__main__':
-    main(sys.argv[1], sys.argv[2], sys.argv[3])
+    main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])