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

carljm · web-flow · commit f5c38382f9c4 · 2023-05-04T17:45:56.000Z
diff --git 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
@@ -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
@@ -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])

Original file line number	Diff line number	Diff line change
`@@ -233,4 +233,4 @@ def main(opcode_py, outfile='Include/opcode.h',`
`233`	`233`
`234`	`234`
`235`	`235`	`if __name__ == '__main__':`
`236`		`- main(sys.argv[1], sys.argv[2], sys.argv[3])`
	`236`	`+ main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])`