Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit 9cb8c3bb2fafe813e98ed52f9cbc392a082bf20e 2 parents efcb8bf + a806876
@teoliphant teoliphant authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 numpy/distutils/fcompiler/__init__.py
View
8 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')),
+ ('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
Please sign in to comment.
Something went wrong with that request. Please try again.