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

[numpy-svn at scipy.org]

Author: rkern
Date: 2007-12-03 23:33:42 -0600 (Mon, 03 Dec 2007)
New Revision: 4533

Modified:
   trunk/numpy/distutils/fcompiler/intel.py
Log:
The PIC flag changed in the 10 version of the Intel Fortran compiler.

Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2007-12-04 04:04:46 UTC (rev 4532)
+++ trunk/numpy/distutils/fcompiler/intel.py	2007-12-04 05:33:42 UTC (rev 4533)
@@ -40,12 +40,18 @@
         'ranlib'       : ["ranlib"]
         }
 
-    pic_flags = ['-KPIC']
+    pic_flags = ['-fPIC']
     module_dir_switch = '-module ' # Don't remove ending space!
     module_include_switch = '-I'
 
     def get_flags(self):
-        opt = self.pic_flags + ["-cm"]
+        v = self.get_version()
+        if v >= '10.0':
+            # Use -fPIC instead of -KPIC.
+            pic_flags = ['-fPIC']
+        else:
+            pic_flags = ['-KPIC']
+        opt = pic_flags + ["-cm"]
         return opt
 
     def get_flags_free(self):
@@ -144,14 +150,6 @@
         '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():