diff options
| author | Isuru Fernando <isuruf@gmail.com> | 2018-07-08 10:11:11 -0600 |
|---|---|---|
| committer | Isuru Fernando <isuruf@gmail.com> | 2018-07-08 10:15:23 -0600 |
| commit | 65687ff01c932b53d641fbe91b8d945d1a550744 (patch) | |
| tree | a991d6ec3ac643990f56ffa29317a6d5ba9ac8bf /numpy | |
| parent | 02e9602a5723aa3cbe9395290e4c18e439065007 (diff) | |
| download | numpy-65687ff01c932b53d641fbe91b8d945d1a550744.tar.gz | |
convert env variable flags and fix LDSHARED
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/fcompiler/__init__.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/fcompiler/environment.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index b23d6dab2..3bd8057b4 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -114,7 +114,7 @@ class FCompiler(CCompiler): compiler_f90 = ('exe.compiler_f90', 'F90', 'f90exec', None, False), compiler_fix = ('exe.compiler_fix', 'F90', 'f90exec', None, False), version_cmd = ('exe.version_cmd', None, None, None, False), - linker_so = ('exe.linker_so', 'LDSHARED', 'ldshared', None, True), + linker_so = ('exe.linker_so', 'LDSHARED', 'ldshared', None, False), linker_exe = ('exe.linker_exe', 'LD', 'ld', None, False), archiver = (None, 'AR', 'ar', None, False), ranlib = (None, 'RANLIB', 'ranlib', None, False), diff --git a/numpy/distutils/fcompiler/environment.py b/numpy/distutils/fcompiler/environment.py index 0a9e1c14f..37012dbb2 100644 --- a/numpy/distutils/fcompiler/environment.py +++ b/numpy/distutils/fcompiler/environment.py @@ -54,13 +54,17 @@ class EnvironmentConfig(object): if envvar is not None: envvar_contents = os.environ.get(envvar) if envvar_contents is not None: + if convert is not None: + envvar_contents = convert(envvar_contents) + else: + envvar_contents = [envvar_contents] if append and os.environ.get('NPY_DISTUTILS_APPEND_FLAGS', '0') == '1': if var is None: var = '' try: - var = ' '.join(var + [envvar_contents]) + var = ' '.join(var + envvar_contents) except TypeError: - var = ' '.join([var] + [envvar_contents]) + var = ' '.join([var] + envvar_contents) else: var = envvar_contents if confvar is not None and self._conf: |