Skip to content

Commit e4eed06

Browse files
committed
Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
ensure "make install" creates symlinks in --prefix bin for the "-32" files in the framework bin directory like the installer does.
2 parents 59a3338 + 6e5fd04 commit e4eed06

2 files changed

Lines changed: 17 additions & 0 deletions

File tree

Mac/Makefile.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ installunixtools:
7676
do \
7777
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
7878
done
79+
ifneq ($(LIPO_32BIT_FLAGS),)
80+
for fn in python3-32 pythonw3-32 \
81+
python$(VERSION)-32 pythonw$(VERSION)-32 ;\
82+
do \
83+
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
84+
done
85+
endif
7986

8087

8188
#
@@ -90,6 +97,12 @@ altinstallunixtools:
9097
do \
9198
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
9299
done
100+
ifneq ($(LIPO_32BIT_FLAGS),)
101+
for fn in python$(VERSION)-32 pythonw$(VERSION)-32 ;\
102+
do \
103+
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
104+
done
105+
endif
93106

94107
pythonw: $(srcdir)/Tools/pythonw.c Makefile
95108
$(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK)

Misc/NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,10 @@ Library
721721
Build
722722
-----
723723

724+
- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
725+
ensure "make install" creates symlinks in --prefix bin for the "-32"
726+
files in the framework bin directory like the installer does.
727+
724728
- Issue #11347: Use --no-as-needed when linking libpython3.so.
725729

726730
- Issue #11411: Fix 'make DESTDIR=' with a relative destination.

0 commit comments

Comments
 (0)