diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-11-12 11:14:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-12 11:14:09 -0800 |
| commit | d87c4197c358a898372c178f6c24f00d54eff745 (patch) | |
| tree | 63e7884f46ed3ee9926aaff402c2d6c0400cad3d /numpy | |
| parent | 1204a3506a1d6abf4a11359f2723014f900ead8a (diff) | |
| parent | e8591afa2aa4cf16c40989ffad757b6afcdefb36 (diff) | |
| download | numpy-d87c4197c358a898372c178f6c24f00d54eff745.tar.gz | |
Merge pull request #10007 from KristoforMaynard/9983_cleanup
MAINT: simplify logic from #9983
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/fcompiler/gnu.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index 04e846e23..0ebbe79dc 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -200,10 +200,9 @@ class GnuFCompiler(FCompiler): opt.append(d2) opt.append(d) # For Macports / Linux, libgfortran and libgcc are not co-located - if sys.platform[:5] == 'linux' or sys.platform == 'darwin': - lib_gfortran_dir = self.get_libgfortran_dir() - if lib_gfortran_dir: - opt.append(lib_gfortran_dir) + lib_gfortran_dir = self.get_libgfortran_dir() + if lib_gfortran_dir: + opt.append(lib_gfortran_dir) return opt def get_libraries(self): @@ -350,10 +349,9 @@ class Gnu95FCompiler(GnuFCompiler): if os.path.exists(os.path.join(mingwdir, "libmingwex.a")): opt.append(mingwdir) # For Macports / Linux, libgfortran and libgcc are not co-located - if sys.platform[:5] == 'linux' or sys.platform == 'darwin': - lib_gfortran_dir = self.get_libgfortran_dir() - if lib_gfortran_dir: - opt.append(lib_gfortran_dir) + lib_gfortran_dir = self.get_libgfortran_dir() + if lib_gfortran_dir: + opt.append(lib_gfortran_dir) return opt def get_libraries(self): |