diff options
| author | Georg Brandl <georg@python.org> | 2007-03-31 18:56:11 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2007-03-31 18:56:11 (GMT) |
| commit | db846037607c2598159fac01724390bf40265e12 (patch) | |
| tree | 25674cd10fadb7ba2d6a756cd0fa660777b52673 /Misc | |
| parent | ea3307bf3f8bc9e3af867dba56ee49042c901ab0 (diff) | |
| download | cpython-db846037607c2598159fac01724390bf40265e12.zip cpython-db846037607c2598159fac01724390bf40265e12.tar.gz cpython-db846037607c2598159fac01724390bf40265e12.tar.bz2 | |
Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
returned by python-config if Python was built with --enable-shared
because that prevented the shared library from being used.
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Misc/python-config.in | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -768,6 +768,10 @@ Tools/Demos Build ----- +- Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS + returned by python-config if Python was built with --enable-shared + because that prevented the shared library from being used. + - Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. diff --git a/Misc/python-config.in b/Misc/python-config.in index e0215a2..9ac4414 100644 --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -45,7 +45,9 @@ elif opt in ('--includes', '--cflags'): elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() libs.append('-lpython'+pyver) - if opt == '--ldflags': + # add the prefix/lib/pythonX.Y/config dir, but only if there is no + # shared library in prefix/lib/. + if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): libs.insert(0, '-L' + getvar('LIBPL')) print ' '.join(libs) |