diff options
| author | Barry Warsaw <barry@python.org> | 2010-10-18 17:09:07 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2010-10-18 17:09:07 (GMT) |
| commit | f040d7de94a057f2c26c8b3d140b33273bfcc595 (patch) | |
| tree | 32e2828b339c11ee35de02631de9353e5d4be2dc /Misc | |
| parent | eebccfb10c423a3f10af8f2bdd0a44cd7e588f37 (diff) | |
| download | cpython-f040d7de94a057f2c26c8b3d140b33273bfcc595.zip cpython-f040d7de94a057f2c26c8b3d140b33273bfcc595.tar.gz cpython-f040d7de94a057f2c26c8b3d140b33273bfcc595.tar.bz2 | |
One more change for issue 9807, by Matthias Klose.
This adds $ABIFLAGS to the static library, since it should match the shared
library name. Also, include the abiflags in python-config --libs.
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/python-config.in | 3 | ||||
| -rw-r--r-- | Misc/python.pc.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Misc/python-config.in b/Misc/python-config.in index ba9183e..1d4a81d 100644 --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -1,4 +1,5 @@ #!@EXENAME@ +# -*- python -*- import getopt import os @@ -45,7 +46,7 @@ for opt in opt_flags: elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() - libs.append('-lpython'+pyver) + libs.append('-lpython' + pyver + sys.abiflags) # add the prefix/lib/pythonX.Y/config dir, but only if there is no # shared library in prefix/lib/. if opt == '--ldflags': diff --git a/Misc/python.pc.in b/Misc/python.pc.in index 08481a9..23b933a 100644 --- a/Misc/python.pc.in +++ b/Misc/python.pc.in @@ -8,6 +8,6 @@ Description: Python library Requires: Version: @VERSION@ Libs.private: @LIBS@ -Libs: -L${libdir} -lpython@VERSION@ +Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ Cflags: -I${includedir}/python@VERSION@ |