From 7316499dd60baa7bb260875b79f7d22be491c986 Mon Sep 17 00:00:00 2001 From: ahmadia Date: Thu, 28 Jun 2012 00:21:25 +0300 Subject: [PATCH 1/2] prefer gfortran (g95) over vendor compilers, g77 and g95 on OSX and Linux. Retain preference for g77 on Windows and vendor compilers on other platforms. --- numpy/distutils/fcompiler/__init__.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index d56ea0cd4859..195bda8e253a 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -706,16 +706,16 @@ def _environment_hook(self, name, hook_name): ('win32', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95', 'intelvem', 'intelem')), ('cygwin.*', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95')), - ('linux.*', ('gnu','intel','lahey','pg','absoft','nag','vast','compaq', - 'intele','intelem','gnu95','g95','pathf95')), - ('darwin.*', ('nag', 'absoft', 'ibm', 'intel', 'gnu', 'gnu95', 'g95', 'pg')), - ('sunos.*', ('sun','gnu','gnu95','g95')), - ('irix.*', ('mips','gnu','gnu95',)), - ('aix.*', ('ibm','gnu','gnu95',)), + ('linux.*', ('gnu95','intel','lahey','pg','absoft','nag','vast','compaq', + 'intele','intelem','gnu','g95','pathf95')), + ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), + ('sunos.*', ('sun','gnu95','gnu','g95')), + ('irix.*', ('mips','gnu95','gnu',)), + ('aix.*', ('ibm','gnu95','gnu',)), # os.name mappings - ('posix', ('gnu','gnu95',)), + ('posix', ('gnu95','gnu',)), ('nt', ('gnu','gnu95',)), - ('mac', ('gnu','gnu95','pg')), + ('mac', ('gnu95','gnu','pg')), ) fcompiler_class = None From 2d4a1cf774c21016cd1336094e2e5b683a0cb1f1 Mon Sep 17 00:00:00 2001 From: Aron Ahmadia Date: Tue, 17 Jul 2012 17:06:13 -0500 Subject: [PATCH 2/2] prefer gfortran over g77 and vendor compilers on OS X and Linux --- numpy/distutils/fcompiler/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index 195bda8e253a..6f92af96cb66 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -709,11 +709,11 @@ def _environment_hook(self, name, hook_name): ('linux.*', ('gnu95','intel','lahey','pg','absoft','nag','vast','compaq', 'intele','intelem','gnu','g95','pathf95')), ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), - ('sunos.*', ('sun','gnu95','gnu','g95')), - ('irix.*', ('mips','gnu95','gnu',)), - ('aix.*', ('ibm','gnu95','gnu',)), + ('sunos.*', ('sun','gnu','gnu95','g95')), + ('irix.*', ('mips','gnu','gnu95',)), + ('aix.*', ('ibm','gnu','gnu95',)), # os.name mappings - ('posix', ('gnu95','gnu',)), + ('posix', ('gnu','gnu95',)), ('nt', ('gnu','gnu95',)), ('mac', ('gnu95','gnu','pg')), )