summaryrefslogtreecommitdiff
path: root/scipy_distutils/gnufcompiler.py
diff options
context:
space:
mode:
authorPearu Peterson <pearu.peterson@gmail.com>2004-01-19 14:05:05 +0000
committerPearu Peterson <pearu.peterson@gmail.com>2004-01-19 14:05:05 +0000
commite27b6ff7669f7f1c1a89779bb45f9d22aff08dcc (patch)
tree2ff22f7bb8a824a327bb2158f025c74a458e2170 /scipy_distutils/gnufcompiler.py
parent23f3f744067d5c88d4c6161e00617b73ed7c5086 (diff)
downloadnumpy-e27b6ff7669f7f1c1a89779bb45f9d22aff08dcc.tar.gz
Fixed gnu version_pattern (final)
Diffstat (limited to 'scipy_distutils/gnufcompiler.py')
-rw-r--r--scipy_distutils/gnufcompiler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scipy_distutils/gnufcompiler.py b/scipy_distutils/gnufcompiler.py
index 53b62954f..89a2edf5b 100644
--- a/scipy_distutils/gnufcompiler.py
+++ b/scipy_distutils/gnufcompiler.py
@@ -10,7 +10,7 @@ from exec_command import find_executable
class GnuFCompiler(FCompiler):
compiler_type = 'gnu'
- version_pattern = r'GNU Fortran ((\(GCC\)|\(GCC .*(\)\)|\)))|)\s*'\
+ version_pattern = r'GNU Fortran ((\(GCC[^\)]*(\)\)|\)))|)\s*'\
'(?P<version>[^\s*\)]+)'
# 'g77 --version' results
@@ -76,7 +76,7 @@ class GnuFCompiler(FCompiler):
return opt
def get_libraries(self):
- opt = FCompiler.get_library_dirs(self)
+ opt = FCompiler.get_libraries(self)
d = self.get_libgcc_dir()
if d is not None:
for g2c in ['g2c-pic','g2c']: