1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carl Meyer 2023-05-04 11:45:56 -06:00 committed by GitHub
parent d47cddfa27
commit f5c38382f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.pre.in
View File

@ -1376,9 +1376,11 @@ regen-opcode:
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/generate_opcode_h.py \ $(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/generate_opcode_h.py \
$(srcdir)/Lib/opcode.py \ $(srcdir)/Lib/opcode.py \
$(srcdir)/Include/opcode.h.new \ $(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/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_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 .PHONY: regen-token
regen-token: regen-token:

2
PCbuild/regen.targets
View File

@ -59,7 +59,7 @@
Inputs="@(_OpcodeSources)" Outputs="@(_OpcodeOutputs)" Inputs="@(_OpcodeSources)" Outputs="@(_OpcodeOutputs)"
DependsOnTargets="FindPythonForBuild"> DependsOnTargets="FindPythonForBuild">
<Message Text="Regenerate @(_OpcodeOutputs->'%(Filename)%(Extension)',' ')" Importance="high" /> <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)" /> WorkingDirectory="$(PySourcePath)" />
<Exec Command="$(PythonForBuild) Python\makeopcodetargets.py Python\opcode_targets.h" <Exec Command="$(PythonForBuild) Python\makeopcodetargets.py Python\opcode_targets.h"
WorkingDirectory="$(PySourcePath)" /> WorkingDirectory="$(PySourcePath)" />

2
Tools/build/generate_opcode_h.py
View File

@ -233,4 +233,4 @@ def main(opcode_py, outfile='Include/opcode.h',
if __name__ == '__main__': 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])