diff options
| author | Ned Deily <nad@acm.org> | 2011-05-28 12:59:55 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-05-28 12:59:55 (GMT) |
| commit | 6e5fd04ce21b421ff975c93611ff6c81547ce183 (patch) | |
| tree | a0ecdb27d93c517402b58a0efeffc70e2020d5ef | |
| parent | 32b5cb0a66956785275c62e1d20b6e5ee4241079 (diff) | |
| download | cpython-6e5fd04ce21b421ff975c93611ff6c81547ce183.zip cpython-6e5fd04ce21b421ff975c93611ff6c81547ce183.tar.gz cpython-6e5fd04ce21b421ff975c93611ff6c81547ce183.tar.bz2 | |
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 | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 5e57b57..8a62a90 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) @@ -44,6 +44,12 @@ Library - Issue #12065: connect_ex() on an SSL socket now returns the original errno when the socket's timeout expires (it used to return None). +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. What's New in Python 3.2.1 release candidate 1? |