diff options
| author | Aaron Meurer <asmeurer@gmail.com> | 2021-06-14 14:07:18 -0600 |
|---|---|---|
| committer | Aaron Meurer <asmeurer@gmail.com> | 2021-06-14 14:07:18 -0600 |
| commit | 8c78b84968e580f24b3705378fb35705a434cdf1 (patch) | |
| tree | c9f82beeb5a2c3f0301f7984d4b6d19539c35d23 /numpy/distutils/fcompiler/gnu.py | |
| parent | 8bf3a4618f1de951c7a4ccdb8bc3e36825a1b744 (diff) | |
| parent | 75f852edf94a7293e7982ad516bee314d7187c2d (diff) | |
| download | numpy-8c78b84968e580f24b3705378fb35705a434cdf1.tar.gz | |
Merge branch 'main' into matrix_rank-doc-fix
Diffstat (limited to 'numpy/distutils/fcompiler/gnu.py')
| -rw-r--r-- | numpy/distutils/fcompiler/gnu.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index 0d9d769c2..eac4cbb47 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -32,7 +32,8 @@ class GnuFCompiler(FCompiler): """Handle the different versions of GNU fortran compilers""" # Strip warning(s) that may be emitted by gfortran while version_string.startswith('gfortran: warning'): - version_string = version_string[version_string.find('\n') + 1:] + version_string =\ + version_string[version_string.find('\n') + 1:].strip() # Gfortran versions from after 2010 will output a simple string # (usually "x.y", "x.y.z" or "x.y.z-q") for ``-dumpversion``; older @@ -126,7 +127,7 @@ class GnuFCompiler(FCompiler): target = '10.9' s = f'Env. variable MACOSX_DEPLOYMENT_TARGET set to {target}' warnings.warn(s, stacklevel=2) - os.environ['MACOSX_DEPLOYMENT_TARGET'] = target + os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(target) opt.extend(['-undefined', 'dynamic_lookup', '-bundle']) else: opt.append("-shared") |