[Numpy-svn] r4382 - in branches/numpy.scons/numpy/distutils: command scons

numpy-svn@scip... numpy-svn@scip...
Mon Nov 5 01:23:21 CST 2007


Author: cdavid
Date: 2007-11-05 01:23:15 -0600 (Mon, 05 Nov 2007)
New Revision: 4382

Modified:
   branches/numpy.scons/numpy/distutils/command/scons.py
   branches/numpy.scons/numpy/distutils/scons/numpyenv.py
Log:
gfortran directly supported through scons tool

Modified: branches/numpy.scons/numpy/distutils/command/scons.py
===================================================================
--- branches/numpy.scons/numpy/distutils/command/scons.py	2007-11-05 07:12:26 UTC (rev 4381)
+++ branches/numpy.scons/numpy/distutils/command/scons.py	2007-11-05 07:23:15 UTC (rev 4382)
@@ -63,7 +63,7 @@
         return 'g77'
     elif compiler.compiler_type == 'gnu95':
         # XXX ?
-        return 'f95'
+        return 'gfortran'
     else:
         return compiler.compiler_type
 

Modified: branches/numpy.scons/numpy/distutils/scons/numpyenv.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/numpyenv.py	2007-11-05 07:12:26 UTC (rev 4381)
+++ branches/numpy.scons/numpy/distutils/scons/numpyenv.py	2007-11-05 07:23:15 UTC (rev 4382)
@@ -157,7 +157,7 @@
             if len(env['f77_opt_path']) > 0:
                 # XXX: what is the right way to add one directory in the
                 # PATH ? (may not work on windows).
-                t = Tool(env['f77_opt'])
+                t = Tool(env['f77_opt'], toolpath = ['numpy/distutils/scons/tools'])
                 t(env) 
                 if sys.platform == 'win32':
                     env['ENV']['PATH'] += ';%s' % env['f77_opt_path']



More information about the Numpy-svn mailing list