summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-12-24 14:17:19 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-12-24 14:17:19 (GMT)
commitb5afe548d4d23d6cff7ab2be259e41cd6017d3c5 (patch)
treeb6624a45b794085e519eb1bb49a9642c9c9096cc
parent92919a66d2bd4641a83edff4356805280d77a068 (diff)
downloadcpython-b5afe548d4d23d6cff7ab2be259e41cd6017d3c5.zip
cpython-b5afe548d4d23d6cff7ab2be259e41cd6017d3c5.tar.gz
cpython-b5afe548d4d23d6cff7ab2be259e41cd6017d3c5.tar.bz2
Fix for issue #7541: python-config --ldflags doesn't pick up libpython2.5.a
-rw-r--r--Makefile.pre.in1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index f367a9b..c10399b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1072,6 +1072,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"
cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)"
diff --git a/Misc/NEWS b/Misc/NEWS
index d734269..130029c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,9 @@ Build
- Switch to OpenSSL 0.9.8l on Windows.
+- Issue #7541: when using ``python-config`` with a framework install the compiler might
+ use the wrong library.
+
Tests
-----