[Numpy-svn] r3942 - trunk/numpy/distutils/fcompiler

[numpy-svn at scipy.org]

Author: rkern
Date: 2007-08-03 17:19:13 -0500 (Fri, 03 Aug 2007)
New Revision: 3942

Modified:
   trunk/numpy/distutils/fcompiler/intel.py
Log:
* Allow an Intel Fortran 10.0 for 64-bit version string that I've seen in the wild.
* Use -fPIC instead of -KPIC for said wild compiler.


Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2007-08-03 21:21:10 UTC (rev 3941)
+++ trunk/numpy/distutils/fcompiler/intel.py	2007-08-03 22:19:13 UTC (rev 3942)
@@ -130,7 +130,7 @@
     compiler_aliases = ()
     description = 'Intel Fortran Compiler for EM64T-based apps'
 
-    version_match = intel_version_match('EM64T-based')
+    version_match = intel_version_match('EM64T-based|Intel\\(R\\) 64')
 
     possible_executables = ['ifort', 'efort', 'efc']
 
@@ -144,6 +144,14 @@
         'ranlib'       : ["ranlib"]
         }
 
+    def get_flags(self):
+        v = self.get_version()
+        if v >= '10.0':
+            # Use -fPIC instead of -KPIC.
+            return ['-fPIC', '-cm']
+        else:
+            return IntelFCompiler.get_flags(self)
+
     def get_flags_arch(self):
         opt = []
         if cpu.is_PentiumIV() or cpu.is_Xeon():