diff options
| author | Travis E. Oliphant <teoliphant@gmail.com> | 2012-07-18 01:19:25 -0500 |
|---|---|---|
| committer | Travis E. Oliphant <teoliphant@gmail.com> | 2012-07-18 01:19:25 -0500 |
| commit | 9cb8c3bb2fafe813e98ed52f9cbc392a082bf20e (patch) | |
| tree | 5aa7a84a62a98702d847ff6160f40e9440795237 | |
| parent | efcb8bfea9fbe77ea47c4432dbacd1c5381a263f (diff) | |
| parent | a806876ef5875720d048de24060b4a3ca9309f09 (diff) | |
| download | numpy-9cb8c3bb2fafe813e98ed52f9cbc392a082bf20e.tar.gz | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | numpy/distutils/fcompiler/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index d56ea0cd4..6f92af96c 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -706,16 +706,16 @@ _default_compilers = ( ('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')), + ('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','gnu','gnu95','g95')), ('irix.*', ('mips','gnu','gnu95',)), ('aix.*', ('ibm','gnu','gnu95',)), # os.name mappings ('posix', ('gnu','gnu95',)), ('nt', ('gnu','gnu95',)), - ('mac', ('gnu','gnu95','pg')), + ('mac', ('gnu95','gnu','pg')), ) fcompiler_class = None |