Skip to content

Commit 0768807

Browse files
authored
Rename python -> python3 (closes #1144) (#1187)
When we removed the com suffix from ape binaries, we broke the build for ape's python for any case-insensitive file system, i.e. Windows and XNU, because there is a third_party/python/Python that gets mirrored in the o directory with the python object files and clashes with the binary name. This patch hacks around this by renaming the binary to "python3" so that it no longer clashes with that directory.
1 parent 0b59f01 commit 0768807

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

third_party/python/BUILD.mk

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ THIRD_PARTY_PYTHON_ARTIFACTS = \
77
THIRD_PARTY_PYTHON_STAGE1_A \
88
THIRD_PARTY_PYTHON_STAGE2_A \
99
THIRD_PARTY_PYTHON_PYTEST_A \
10-
THIRD_PARTY_PYTHON_PYTHON \
10+
THIRD_PARTY_PYTHON_PYTHON3 \
1111
THIRD_PARTY_PYTHON_FREEZE
1212

1313
THIRD_PARTY_PYTHON_BINS = \
@@ -17,7 +17,7 @@ THIRD_PARTY_PYTHON_BINS = \
1717
THIRD_PARTY_PYTHON_COMS = \
1818
o/$(MODE)/third_party/python/Parser/asdl_c \
1919
o/$(MODE)/third_party/python/pystone \
20-
o/$(MODE)/third_party/python/python \
20+
o/$(MODE)/third_party/python/python3 \
2121
o/$(MODE)/third_party/python/freeze \
2222
o/$(MODE)/third_party/python/pycomp \
2323
o/$(MODE)/third_party/python/pyobj \
@@ -29,7 +29,7 @@ THIRD_PARTY_PYTHON_CHECKS = \
2929
$(THIRD_PARTY_PYTHON_STAGE2_A).pkg \
3030
$(THIRD_PARTY_PYTHON_PYTEST_A).pkg \
3131
$(THIRD_PARTY_PYTHON_HDRS:%=o/$(MODE)/%.ok) \
32-
o/$(MODE)/third_party/python/python.pkg \
32+
o/$(MODE)/third_party/python/python3.pkg \
3333
o/$(MODE)/third_party/python/freeze.pkg
3434

3535
# TODO: Deal with aarch64 under qemu not making execve() easy.
@@ -3980,12 +3980,12 @@ THIRD_PARTY_PYTHON_SRCS = \
39803980
################################################################################
39813981
# PYTHON
39823982

3983-
THIRD_PARTY_PYTHON_PYTHON_SRCS = third_party/python/python.c
3984-
THIRD_PARTY_PYTHON_PYTHON_OBJS = o/$(MODE)/third_party/python/python.o
3985-
THIRD_PARTY_PYTHON_PYTHON_COMS = o/$(MODE)/third_party/python/python
3986-
THIRD_PARTY_PYTHON_PYTHON_BINS = $(THIRD_PARTY_PYTHON_PYTHON_COMS) $(THIRD_PARTY_PYTHON_PYTHON_COMS:%=%.dbg)
3987-
THIRD_PARTY_PYTHON_PYTHON_DEPS = $(call uniq,$(foreach x,$(THIRD_PARTY_PYTHON_PYTHON_DIRECTDEPS),$($(x))))
3988-
THIRD_PARTY_PYTHON_PYTHON_DIRECTDEPS = \
3983+
THIRD_PARTY_PYTHON_PYTHON3_SRCS = third_party/python/python3.c
3984+
THIRD_PARTY_PYTHON_PYTHON3_OBJS = o/$(MODE)/third_party/python/python3.o
3985+
THIRD_PARTY_PYTHON_PYTHON3_COMS = o/$(MODE)/third_party/python/python3
3986+
THIRD_PARTY_PYTHON_PYTHON3_BINS = $(THIRD_PARTY_PYTHON_PYTHON3_COMS) $(THIRD_PARTY_PYTHON_PYTHON3_COMS:%=%.dbg)
3987+
THIRD_PARTY_PYTHON_PYTHON3_DEPS = $(call uniq,$(foreach x,$(THIRD_PARTY_PYTHON_PYTHON3_DIRECTDEPS),$($(x))))
3988+
THIRD_PARTY_PYTHON_PYTHON3_DIRECTDEPS = \
39893989
LIBC_CALLS \
39903990
LIBC_FMT \
39913991
LIBC_INTRIN \
@@ -4005,14 +4005,14 @@ THIRD_PARTY_PYTHON_PYTHON_DIRECTDEPS = \
40054005
THIRD_PARTY_XED \
40064006
TOOL_ARGS
40074007

4008-
o/$(MODE)/third_party/python/python.pkg: \
4009-
$(THIRD_PARTY_PYTHON_PYTHON_OBJS) \
4010-
$(foreach x,$(THIRD_PARTY_PYTHON_PYTHON_DIRECTDEPS),$($(x)_A).pkg)
4008+
o/$(MODE)/third_party/python/python3.pkg: \
4009+
$(THIRD_PARTY_PYTHON_PYTHON3_OBJS) \
4010+
$(foreach x,$(THIRD_PARTY_PYTHON_PYTHON3_DIRECTDEPS),$($(x)_A).pkg)
40114011

4012-
o/$(MODE)/third_party/python/python.dbg: \
4013-
o/$(MODE)/third_party/python/python.pkg \
4014-
$(THIRD_PARTY_PYTHON_PYTHON_DEPS) \
4015-
$(THIRD_PARTY_PYTHON_PYTHON_OBJS) \
4012+
o/$(MODE)/third_party/python/python3.dbg: \
4013+
o/$(MODE)/third_party/python/python3.pkg \
4014+
$(THIRD_PARTY_PYTHON_PYTHON3_DEPS) \
4015+
$(THIRD_PARTY_PYTHON_PYTHON3_OBJS) \
40164016
$(CRT) \
40174017
$(APE_NO_MODIFY_SELF)
40184018
@$(APELINK)
File renamed without changes.

0 commit comments

Comments
 (0)