diff options
| author | Ned Deily <nad@acm.org> | 2011-05-28 06:04:02 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-05-28 06:04:02 -0700 |
| commit | e4eed06dfa3d508235df147aaac44d0dad017e7a (patch) | |
| tree | a3b69b169ab85a5cba3bc7bbab218b69d282441f | |
| parent | 59a333844a8a864ef4d41524e931a641ec59f00f (diff) | |
| parent | 6e5fd04ce21b421ff975c93611ff6c81547ce183 (diff) | |
| download | cpython-git-e4eed06dfa3d508235df147aaac44d0dad017e7a.tar.gz | |
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.
| -rw-r--r-- | Mac/Makefile.in | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 5e57b57942..8a62a9097c 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -76,6 +76,13 @@ installunixtools: do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done +ifneq ($(LIPO_32BIT_FLAGS),) + for fn in python3-32 pythonw3-32 \ + python$(VERSION)-32 pythonw$(VERSION)-32 ;\ + do \ + ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ + done +endif # @@ -90,6 +97,12 @@ altinstallunixtools: do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done +ifneq ($(LIPO_32BIT_FLAGS),) + for fn in python$(VERSION)-32 pythonw$(VERSION)-32 ;\ + do \ + ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ + done +endif pythonw: $(srcdir)/Tools/pythonw.c Makefile $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK) @@ -721,6 +721,10 @@ Library Build ----- +- 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. + - Issue #11347: Use --no-as-needed when linking libpython3.so. - Issue #11411: Fix 'make DESTDIR=' with a relative destination. |