Skip to content

Commit 65687ff

Browse files
committed
convert env variable flags and fix LDSHARED
1 parent 02e9602 commit 65687ff

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

‎numpy/distutils/fcompiler/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class FCompiler(CCompiler):
114114
compiler_f90 = ('exe.compiler_f90', 'F90', 'f90exec', None, False),
115115
compiler_fix = ('exe.compiler_fix', 'F90', 'f90exec', None, False),
116116
version_cmd = ('exe.version_cmd', None, None, None, False),
117-
linker_so = ('exe.linker_so', 'LDSHARED', 'ldshared', None, True),
117+
linker_so = ('exe.linker_so', 'LDSHARED', 'ldshared', None, False),
118118
linker_exe = ('exe.linker_exe', 'LD', 'ld', None, False),
119119
archiver = (None, 'AR', 'ar', None, False),
120120
ranlib = (None, 'RANLIB', 'ranlib', None, False),

‎numpy/distutils/fcompiler/environment.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,17 @@ def _get_var(self, name, conf_desc):
5454
if envvar is not None:
5555
envvar_contents = os.environ.get(envvar)
5656
if envvar_contents is not None:
57+
if convert is not None:
58+
envvar_contents = convert(envvar_contents)
59+
else:
60+
envvar_contents = [envvar_contents]
5761
if append and os.environ.get('NPY_DISTUTILS_APPEND_FLAGS', '0') == '1':
5862
if var is None:
5963
var = ''
6064
try:
61-
var = ' '.join(var + [envvar_contents])
65+
var = ' '.join(var + envvar_contents)
6266
except TypeError:
63-
var = ' '.join([var] + [envvar_contents])
67+
var = ' '.join([var] + envvar_contents)
6468
else:
6569
var = envvar_contents
6670
if confvar is not None and self._conf:

0 commit comments

Comments
 (0)