From 84690e743db202d7753af3b80c5698cc2d1196f6 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Thu, 4 May 2023 10:08:36 -0700 Subject: [PATCH 1/3] gh-103963: fix 'make regen-opcode' in out-of-tree builds --- Makefile.pre.in | 2 ++ Tools/build/generate_opcode_h.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index b285ef9e832db5..6626770160986c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1377,8 +1377,10 @@ regen-opcode: $(srcdir)/Lib/opcode.py \ $(srcdir)/Include/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/Tools/build/generate_opcode_h.py b/Tools/build/generate_opcode_h.py index adcbaf2b8e08bf..5be981005725bf 100644 --- 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]) From 6f0cf4f3d399ac5e7773b8afe75e25c614bbd47c Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Thu, 4 May 2023 10:18:02 -0700 Subject: [PATCH 2/3] also update the Windows automation to pass the additional argument --- PCbuild/regen.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets index aeb7e2e185d9f8..107066817ba6b0 100644 --- a/PCbuild/regen.targets +++ b/PCbuild/regen.targets @@ -59,7 +59,7 @@ Inputs="@(_OpcodeSources)" Outputs="@(_OpcodeOutputs)" DependsOnTargets="FindPythonForBuild"> - From 9024e0dd6ae5e8252e549cbc4df5ee9939d152fe Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Thu, 4 May 2023 10:21:39 -0700 Subject: [PATCH 3/3] add missing backslash --- Makefile.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 6626770160986c..736a520d0e8fb6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1376,7 +1376,7 @@ 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 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy