diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-12-24 14:24:05 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-12-24 14:24:05 (GMT) |
| commit | 8c0678132f7360a36a1a1796cb94f5958fa35071 (patch) | |
| tree | 7cc42209fb90f5d7b0ea2f13fe66283079ce4f99 | |
| parent | 38ce3de0f466e3537efe316ebe31a7769187bbc3 (diff) | |
| download | cpython-8c0678132f7360a36a1a1796cb94f5958fa35071.zip cpython-8c0678132f7360a36a1a1796cb94f5958fa35071.tar.gz cpython-8c0678132f7360a36a1a1796cb94f5958fa35071.tar.bz2 | |
Merged revisions 77035 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77035 | ronald.oussoren | 2009-12-24 15:21:55 +0100 (Thu, 24 Dec 2009) | 9 lines
Merged revisions 77033 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77033 | ronald.oussoren | 2009-12-24 15:17:19 +0100 (Thu, 24 Dec 2009) | 2 lines
Fix for issue #7541: python-config --ldflags doesn't pick up libpython2.5.a
........
................
| -rw-r--r-- | Makefile.pre.in | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index a35811c..2c19e15 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1068,6 +1068,7 @@ frameworkinstallstructure: $(LDLIBRARY) # install (which includes python-config) happy. frameworkinstallmaclib: ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config/libpython$(VERSION).a" + ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config/libpython$(VERSION).dylib" ln -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib" # This installs the IDE, the Launcher and other apps into /Applications @@ -278,6 +278,9 @@ Build - Issue #6801 : symmetric_difference_update also accepts |. Thanks to Carl Chenet. +- Issue #7541: when using ``python-config`` with a framework install the compiler might + use the wrong library. + Documentation ------------- |