summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-12-24 14:19:38 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-12-24 14:19:38 (GMT)
commit63364fbda19fed9ea552c325d5d6d2bde8765150 (patch)
tree27ea2b35f71ec15f9259587b6309b1a7f0cc1fb8
parent175dc9dc44969a8e7c725a71c1703c0aefd06887 (diff)
downloadcpython-63364fbda19fed9ea552c325d5d6d2bde8765150.zip
cpython-63364fbda19fed9ea552c325d5d6d2bde8765150.tar.gz
cpython-63364fbda19fed9ea552c325d5d6d2bde8765150.tar.bz2
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.in1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index b1c1735..5d70f10 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1051,6 +1051,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"
cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)"
# This installs the IDE, the Launcher and other apps into /Applications
diff --git a/Misc/NEWS b/Misc/NEWS
index 5c18341..adc053b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -128,6 +128,10 @@ Build
binary distribution on OSX 10.6 even when the user does not
have the 10.4u SDK installed.
+- Issue #7541: when using ``python-config`` with a framework install the compiler might
+ use the wrong library.
+
+
Tests
-----