[Numpy-svn] r4563 - branches/numpy.scons/numpy/distutils/scons/core

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-12-07 05:32:36 -0600 (Fri, 07 Dec 2007)
New Revision: 4563

Modified:
   branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py
Log:
Handle correctly F77FLAGS when initializing SHF77FLAGS for scons build

Modified: branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py	2007-12-07 11:31:14 UTC (rev 4562)
+++ branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py	2007-12-07 11:32:36 UTC (rev 4563)
@@ -268,7 +268,7 @@
     if not env.has_key('F77FLAGS'):
         env['F77FLAGS'] = env.subst('$_FORTRANFLAGSG')
     if not env.has_key('SHF77FLAGS'):
-        env['SHF77FLAGS'] = env.subst('$_SHFORTRANFLAGSG')
+        env['SHF77FLAGS'] = '$F77FLAGS %s' % env.subst('$_SHFORTRANFLAGSG')
 
 def initialize_cxx(env, path_list):
     from SCons.Tool import Tool, FindTool
@@ -392,12 +392,12 @@
     #     Misc
     #---------------
 
-    # We sometimes need to put link flags at the really end of the command line, so we add a construction variable for it
+    # We sometimes need to put link flags at the really end of the command
+    # line, so we add a construction variable for it
     env['LINKFLAGSEND'] = []
     env['SHLINKFLAGSEND'] = ['$LINKFLAGSEND']
     env['LDMODULEFLAGSEND'] = []
 
-    
     # For mingw tools, we do it in our custom mingw scons tool
     if not env['cc_opt'] == 'mingw':
         env['LINKCOM'] = '%s $LINKFLAGSEND' % env['LINKCOM']