summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-03-04 14:31:04 -0800
committerNed Deily <nad@acm.org>2013-03-04 14:31:04 -0800
commiteec152d21783b901efae86afde771995fb357136 (patch)
treebcc20ae455caa7a299aaaaf4b9927d1cafc40b78
parent49e4dfeec8a54eb130200d881d4e72d808a36769 (diff)
downloadcpython-git-eec152d21783b901efae86afde771995fb357136.tar.gz
Issue #16848: python-config now returns proper --ldflags values for OS X
framework builds.
-rw-r--r--Misc/NEWS3
-rw-r--r--Misc/python-config.in3
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 15af7665d3..588a5c6402 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -923,6 +923,9 @@ Build
- Issue #17161: make install now also installs a python2 and python man page.
+- Issue #16848: python-config now returns proper --ldflags values for OS X
+ framework builds.
+
Tools/Demos
-----------
diff --git a/Misc/python-config.in b/Misc/python-config.in
index 552bbd55fe..ca9857a89b 100644
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -51,6 +51,7 @@ for opt in opt_flags:
if opt == '--ldflags':
if not getvar('Py_ENABLE_SHARED'):
libs.insert(0, '-L' + getvar('LIBPL'))
- libs.extend(getvar('LINKFORSHARED').split())
+ if not getvar('PYTHONFRAMEWORK'):
+ libs.extend(getvar('LINKFORSHARED').split())
print ' '.join(libs)