diff options
author | rgommers <ralf.gommers@googlemail.com> | 2011-06-19 11:49:13 +0200 |
---|---|---|
committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2011-06-23 23:44:39 +0200 |
commit | 9a287ba152e26ec0c9a1d658a3532f61e9291faa (patch) | |
tree | 825ea77978e33700f0371bb276602bcd0860dcb0 /numpy/distutils/fcompiler | |
parent | 8d451bcbdcd5f16342f779b94182d45738a8e8c6 (diff) | |
download | numpy-9a287ba152e26ec0c9a1d658a3532f61e9291faa.tar.gz |
BUG: deal with shared lib extension in a single place. Fix ctypes.load_library.
This is related to PEP 3149, tags in shared library extensions. Only applies
to Linux (for now). See also #1749.
Diffstat (limited to 'numpy/distutils/fcompiler')
-rw-r--r-- | numpy/distutils/fcompiler/__init__.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index d2400459f..69d9d68d3 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -27,7 +27,7 @@ except NameError: from numpy.compat import open_latin1 -from distutils.sysconfig import get_config_var, get_config_vars, get_python_lib +from distutils.sysconfig import get_python_lib from distutils.fancy_getopt import FancyGetopt from distutils.errors import DistutilsModuleError, \ DistutilsExecError, CompileError, LinkError, DistutilsPlatformError @@ -35,7 +35,8 @@ from distutils.util import split_quoted, strtobool from numpy.distutils.ccompiler import CCompiler, gen_lib_options from numpy.distutils import log -from numpy.distutils.misc_util import is_string, all_strings, is_sequence, make_temp_file +from numpy.distutils.misc_util import is_string, all_strings, is_sequence, \ + make_temp_file, get_shared_lib_extension from numpy.distutils.environment import EnvironmentConfig from numpy.distutils.exec_command import find_executable from numpy.distutils.compat import get_exception @@ -195,10 +196,8 @@ class FCompiler(CCompiler): src_extensions = ['.for','.ftn','.f77','.f','.f90','.f95','.F','.F90'] obj_extension = ".o" - shared_lib_extension = get_config_var('SO') # or .dll - # fix long extension for Python >=3.2, see PEP 3149. - if 'SOABI' in get_config_vars(): - shared_lib_extension = shared_lib_extension.replace('.'+get_config_var('SOABI'), '', 1) + + shared_lib_extension = get_shared_lib_extension() static_lib_extension = ".a" # or .lib static_lib_format = "lib%s%s" # or %s%s shared_lib_format = "%s%s" |