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

[numpy-svn at scipy.org]

Author: cookedm
Date: 2007-05-28 12:59:49 -0500 (Mon, 28 May 2007)
New Revision: 3838

Modified:
   trunk/numpy/distutils/fcompiler/absoft.py
   trunk/numpy/distutils/fcompiler/intel.py
Log:
fix my mistake in fcompiler/absoft.py and fcompiler/intel.py

Modified: trunk/numpy/distutils/fcompiler/absoft.py
===================================================================
--- trunk/numpy/distutils/fcompiler/absoft.py	2007-05-28 17:49:55 UTC (rev 3837)
+++ trunk/numpy/distutils/fcompiler/absoft.py	2007-05-28 17:59:49 UTC (rev 3838)
@@ -30,7 +30,7 @@
     # Note that fink installs g77 as f77, so need to use f90 for detection.
 
     executables = {
-        'version_cmd'  : None,
+        'version_cmd'  : ['<F90>', None],
         'compiler_f77' : ["f77"],
         'compiler_fix' : ["f90"],
         'compiler_f90' : ["f90"],
@@ -45,9 +45,9 @@
     module_dir_switch = None
     module_include_switch = '-p'
 
-    def get_version_cmd(self):
+    def get_flags_version(self):
         f = cyg2win32(dummy_fortran_file())
-        return ['<F90>', '-V', '-c', f+'.f', '-o', f+'.o']
+        return ['-V', '-c', f+'.f', '-o', f+'.o']
 
     def get_flags_linker_so(self):
         if os.name=='nt':

Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2007-05-28 17:49:55 UTC (rev 3837)
+++ trunk/numpy/distutils/fcompiler/intel.py	2007-05-28 17:59:49 UTC (rev 3838)
@@ -24,7 +24,7 @@
     possible_executables = ['ifort', 'ifc']
 
     executables = {
-        'version_cmd'  : None,
+        'version_cmd'  : ['<F77>', None],
         'compiler_f77' : [None,"-72","-w90","-w95"],
         'compiler_f90' : [None],
         'compiler_fix' : [None,"-FI"],
@@ -37,9 +37,9 @@
     module_dir_switch = '-module ' # Don't remove ending space!
     module_include_switch = '-I'
 
-    def get_version_cmd(self):
+    def get_flags_version(self):
         f = dummy_fortran_file()
-        return ['<F77>', '-FI', '-V', '-c', f + '.f', '-o', f + '.o']
+        return ['-FI', '-V', '-c', f + '.f', '-o', f + '.o']
 
     def get_flags(self):
         opt = self.pic_flags + ["-cm"]
@@ -94,7 +94,7 @@
     possible_executables = ['ifort', 'efort', 'efc']
 
     executables = {
-        'version_cmd'  : None,
+        'version_cmd'  : ['<F77>', None],
         'compiler_f77' : [None,"-FI","-w90","-w95"],
         'compiler_fix' : [None,"-FI"],
         'compiler_f90' : [None],
@@ -112,7 +112,7 @@
     possible_executables = ['ifort', 'efort', 'efc']
 
     executables = {
-        'version_cmd'  : None,
+        'version_cmd'  : ['<F77>', None],
         'compiler_f77' : [None, "-FI", "-w90", "-w95"],
         'compiler_fix' : [None, "-FI"],
         'compiler_f90' : [None],
@@ -139,7 +139,7 @@
     possible_executables = ['ifl']
 
     executables = {
-        'version_cmd'  : None,
+        'version_cmd'  : ['<F77>', None],
         'compiler_f77' : [None,"-FI","-w90","-w95"],
         'compiler_fix' : [None,"-FI","-4L72","-w"],
         'compiler_f90' : [None],
@@ -154,9 +154,9 @@
     module_dir_switch = '/module:' #No space after /module:
     module_include_switch = '/I'
 
-    def get_version_cmd(self):
+    def get_flags_version(self):
         f = dummy_fortran_file()
-        return ['<F77>', '-FI', '-V', '-c', f + '.f', '-o', f + '.o']
+        return ['-FI', '-V', '-c', f + '.f', '-o', f + '.o']
 
     def get_flags(self):
         opt = ['/nologo','/MD','/nbs','/Qlowercase','/us']
@@ -195,7 +195,7 @@
     ar_exe = IntelVisualFCompiler.ar_exe
 
     executables = {
-        'version_cmd'  : None,
+        'version_cmd'  : ['<F77>', None],
         'compiler_f77' : [None,"-FI","-w90","-w95"],
         'compiler_fix' : [None,"-FI","-4L72","-w"],
         'compiler_f90' : [None],