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

gh-114883: Fix Makefile dependency tree for non-jit builds (GH-114884)

Browse Source
This commit is contained in:
Zachary Ware 2024-02-03 17:16:03 -06:00 committed by GitHub
parent 72d2d0f10d
commit 1032326fe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.pre.in
View File

@ -2643,7 +2643,18 @@ config.status: $(srcdir)/configure
Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $< $(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
Python/jit.o: regen-jit
JIT_DEPS = \
$(srcdir)/Tools/jit/*.c \
$(srcdir)/Tools/jit/*.py \
$(srcdir)/Python/executor_cases.c.h \
pyconfig.h
jit_stencils.h: $(JIT_DEPS)
@REGEN_JIT_COMMAND@
Python/jit.o: $(srcdir)/Python/jit.c @JIT_STENCILS_H@
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
.PHONY: regen-jit .PHONY: regen-jit
regen-jit: regen-jit:

3
configure generated vendored
View File

@ -920,6 +920,7 @@ LLVM_AR
PROFILE_TASK PROFILE_TASK
DEF_MAKE_RULE DEF_MAKE_RULE
DEF_MAKE_ALL_RULE DEF_MAKE_ALL_RULE
JIT_STENCILS_H
REGEN_JIT_COMMAND REGEN_JIT_COMMAND
ABIFLAGS ABIFLAGS
LN LN
@ -8019,12 +8020,14 @@ then :
else $as_nop else $as_nop
as_fn_append CFLAGS_NODIST " -D_Py_JIT" as_fn_append CFLAGS_NODIST " -D_Py_JIT"
REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host" REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"
JIT_STENCILS_H="jit_stencils.h"
if test "x$Py_DEBUG" = xtrue if test "x$Py_DEBUG" = xtrue
then : then :
as_fn_append REGEN_JIT_COMMAND " --debug" as_fn_append REGEN_JIT_COMMAND " --debug"
fi fi
fi fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_experimental_jit" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_experimental_jit" >&5
printf "%s\n" "$enable_experimental_jit" >&6; } printf "%s\n" "$enable_experimental_jit" >&6; }

2
configure.ac
View File

@ -1592,11 +1592,13 @@ AS_VAR_IF([enable_experimental_jit],
[AS_VAR_APPEND([CFLAGS_NODIST], [" -D_Py_JIT"]) [AS_VAR_APPEND([CFLAGS_NODIST], [" -D_Py_JIT"])
AS_VAR_SET([REGEN_JIT_COMMAND], AS_VAR_SET([REGEN_JIT_COMMAND],
["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"]) ["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"])
AS_VAR_SET([JIT_STENCILS_H], ["jit_stencils.h"])
AS_VAR_IF([Py_DEBUG], AS_VAR_IF([Py_DEBUG],
[true], [true],
[AS_VAR_APPEND([REGEN_JIT_COMMAND], [" --debug"])], [AS_VAR_APPEND([REGEN_JIT_COMMAND], [" --debug"])],
[])]) [])])
AC_SUBST([REGEN_JIT_COMMAND]) AC_SUBST([REGEN_JIT_COMMAND])
AC_SUBST([JIT_STENCILS_H])
AC_MSG_RESULT([$enable_experimental_jit]) AC_MSG_RESULT([$enable_experimental_jit])
# Enable optimization flags # Enable optimization flags