View | Details | Raw Unified | Return to bug 36684
Collapse All | Expand All

(-)a/numpy/distutils/fcompiler/gnu.py (-2 / +4 lines)
Lines 167-173 class GnuFCompiler(FCompiler): Link Here
167
        return None
167
        return None
168
168
169
    def get_libgfortran_dir(self):
169
    def get_libgfortran_dir(self):
170
        if sys.platform[:5] == 'linux':
170
        if sys.platform[:5] == 'linux' and platform.machine() != "e2k":
171
            libgfortran_name = 'libgfortran.so'
171
            libgfortran_name = 'libgfortran.so'
172
        elif sys.platform == 'darwin':
172
        elif sys.platform == 'darwin':
173
            libgfortran_name = 'libgfortran.dylib'
173
            libgfortran_name = 'libgfortran.dylib'
Lines 208-214 class GnuFCompiler(FCompiler): Link Here
208
    def get_libraries(self):
208
    def get_libraries(self):
209
        opt = []
209
        opt = []
210
        d = self.get_libgcc_dir()
210
        d = self.get_libgcc_dir()
211
        if d is not None:
211
        if d is not None and self.g2c is not None:
212
            g2c = self.g2c + '-pic'
212
            g2c = self.g2c + '-pic'
213
            f = self.static_lib_format % (g2c, self.static_lib_extension)
213
            f = self.static_lib_format % (g2c, self.static_lib_extension)
214
            if not os.path.isfile(os.path.join(d, f)):
214
            if not os.path.isfile(os.path.join(d, f)):
Lines 304-309 class Gnu95FCompiler(GnuFCompiler): Link Here
304
    module_include_switch = '-I'
304
    module_include_switch = '-I'
305
305
306
    g2c = 'gfortran'
306
    g2c = 'gfortran'
307
    if platform.machine() == "e2k":
308
        g2c = None
307
309
308
    def _universal_flags(self, cmd):
310
    def _universal_flags(self, cmd):
309
        """Return a list of -arch flags for every supported architecture."""
311
        """Return a list of -arch flags for every supported architecture."""
(-)a/numpy/distutils/system_info.py (-1 / +2 lines)
Lines 1463-1469 def get_atlas_version(**config): Link Here
1463
        s, o = c.get_output(atlas_version_c_text,
1463
        s, o = c.get_output(atlas_version_c_text,
1464
                            libraries=libraries, library_dirs=library_dirs,
1464
                            libraries=libraries, library_dirs=library_dirs,
1465
                            use_tee=(system_info.verbosity > 0))
1465
                            use_tee=(system_info.verbosity > 0))
1466
        if s and re.search(r'undefined reference to `_gfortran', o, re.M):
1466
        if s and re.search(r'undefined reference to `_gfortran', o,re.M) \
1467
            and platform.machine() != "e2k":
1467
            s, o = c.get_output(atlas_version_c_text,
1468
            s, o = c.get_output(atlas_version_c_text,
1468
                                libraries=libraries + ['gfortran'],
1469
                                libraries=libraries + ['gfortran'],
1469
                                library_dirs=library_dirs,
1470
                                library_dirs=library_dirs,

Return to bug 36684