Skip to content

Commit 93306d2

Browse files
Fix match for linux platforms
1 parent 0ceca36 commit 93306d2

File tree

1 file changed

+20
-25
lines changed

1 file changed

+20
-25
lines changed

Makefile.pre.in

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3129,35 +3129,30 @@ config.status: $(srcdir)/configure
31293129
Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S
31303130
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
31313131

3132-
3133-
JIT_DEPS = \
3134-
$(srcdir)/Tools/jit/*.c \
3135-
$(srcdir)/Tools/jit/*.py \
3136-
$(srcdir)/Python/executor_cases.c.h \
3137-
pyconfig.h
3132+
# Determine correct JIT stencil header based on host triple
3133+
ifeq (,$(JIT_STENCIL_HEADER))
3134+
ifneq ($(filter aarch64-apple-darwin%,$(HOST_GNU_TYPE)),)
3135+
JIT_STENCIL_HEADER := jit_stencils-aarch64-apple-darwin.h
3136+
else ifneq ($(filter x86_64-apple-darwin%,$(HOST_GNU_TYPE)),)
3137+
JIT_STENCIL_HEADER := jit_stencils-x86_64-apple-darwin.h
3138+
else ifeq ($(HOST_GNU_TYPE), aarch64-pc-windows-msvc)
3139+
JIT_STENCIL_HEADER := jit_stencils-aarch64-pc-windows-msvc.h
3140+
else ifeq ($(HOST_GNU_TYPE), i686-pc-windows-msvc)
3141+
JIT_STENCIL_HEADER := jit_stencils-i686-pc-windows-msvc.h
3142+
else ifeq ($(HOST_GNU_TYPE), x86_64-pc-windows-msvc)
3143+
JIT_STENCIL_HEADER := jit_stencils-x86_64-pc-windows-msvc.h
3144+
else ifneq ($(filter aarch64-%-linux-gnu,$(HOST_GNU_TYPE)),)
3145+
JIT_STENCIL_HEADER := jit_stencils-$(HOST_GNU_TYPE).h
3146+
else ifneq ($(filter x86_64-%-linux-gnu,$(HOST_GNU_TYPE)),)
3147+
JIT_STENCIL_HEADER := jit_stencils-$(HOST_GNU_TYPE).h
3148+
else
3149+
$(error "Unsupported host triple: $(HOST_GNU_TYPE).")
3150+
endif
3151+
endif
31383152

31393153
jit_stencils.h $(JIT_STENCIL_HEADER): $(JIT_DEPS)
31403154
@REGEN_JIT_COMMAND@
31413155

3142-
# Match Darwin hosts with version suffixes
3143-
ifneq ($(filter aarch64-apple-darwin%,$(HOST_GNU_TYPE)),)
3144-
JIT_STENCIL_HEADER = jit_stencils-aarch64-apple-darwin.h
3145-
else ifneq ($(filter x86_64-apple-darwin%,$(HOST_GNU_TYPE)),)
3146-
JIT_STENCIL_HEADER = jit_stencils-x86_64-apple-darwin.h
3147-
else ifeq ($(HOST_GNU_TYPE), aarch64-pc-windows-msvc)
3148-
JIT_STENCIL_HEADER = jit_stencils-aarch64-pc-windows-msvc.h
3149-
else ifeq ($(HOST_GNU_TYPE), i686-pc-windows-msvc)
3150-
JIT_STENCIL_HEADER = jit_stencils-i686-pc-windows-msvc.h
3151-
else ifeq ($(HOST_GNU_TYPE), x86_64-pc-windows-msvc)
3152-
JIT_STENCIL_HEADER = jit_stencils-x86_64-pc-windows-msvc.h
3153-
else ifneq ($(filter aarch64-%-linux-gnu,$(HOST_GNU_TYPE)),)
3154-
JIT_STENCIL_HEADER = jit_stencils-aarch64-unknown-linux-gnu.h
3155-
else ifneq ($(filter x86_64-%-linux-gnu,$(HOST_GNU_TYPE)),)
3156-
JIT_STENCIL_HEADER = jit_stencils-x86_64-unknown-linux-gnu.h
3157-
else
3158-
$(error "Unsupported host triple: $(HOST_GNU_TYPE). Please update the Makefile to support this host triple.")
3159-
endif
3160-
31613156
Python/jit.o: $(srcdir)/Python/jit.c jit_stencils.h $(JIT_STENCIL_HEADER)
31623157
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
31633158

0 commit comments

Comments
 (0)