Skip to content

Commit 1032326

Browse files
authored
gh-114883: Fix Makefile dependency tree for non-jit builds (GH-114884)
1 parent 72d2d0f commit 1032326

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

Makefile.pre.in

+12-1
Original file line numberDiff line numberDiff line change
@@ -2643,7 +2643,18 @@ config.status: $(srcdir)/configure
26432643
Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S
26442644
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
26452645

2646-
Python/jit.o: regen-jit
2646+
2647+
JIT_DEPS = \
2648+
$(srcdir)/Tools/jit/*.c \
2649+
$(srcdir)/Tools/jit/*.py \
2650+
$(srcdir)/Python/executor_cases.c.h \
2651+
pyconfig.h
2652+
2653+
jit_stencils.h: $(JIT_DEPS)
2654+
@REGEN_JIT_COMMAND@
2655+
2656+
Python/jit.o: $(srcdir)/Python/jit.c @JIT_STENCILS_H@
2657+
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
26472658

26482659
.PHONY: regen-jit
26492660
regen-jit:

configure

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

+2
Original file line numberDiff line numberDiff line change
@@ -1592,11 +1592,13 @@ AS_VAR_IF([enable_experimental_jit],
15921592
[AS_VAR_APPEND([CFLAGS_NODIST], [" -D_Py_JIT"])
15931593
AS_VAR_SET([REGEN_JIT_COMMAND],
15941594
["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"])
1595+
AS_VAR_SET([JIT_STENCILS_H], ["jit_stencils.h"])
15951596
AS_VAR_IF([Py_DEBUG],
15961597
[true],
15971598
[AS_VAR_APPEND([REGEN_JIT_COMMAND], [" --debug"])],
15981599
[])])
15991600
AC_SUBST([REGEN_JIT_COMMAND])
1601+
AC_SUBST([JIT_STENCILS_H])
16001602
AC_MSG_RESULT([$enable_experimental_jit])
16011603

16021604
# Enable optimization flags

0 commit comments

Comments
 (0)