Fix handling of ${F77,F90,F95,FORTRAN}COM so they can be overridden properly.

1 files changed, 33 insertions, 21 deletions

diff --git a/src/engine/SCons/Tool/f90.py b/src/engine/SCons/Tool/f90.py
index b00a76e..47be38f 100644
--- a/src/engine/SCons/Tool/f90.py
+++ b/src/engine/SCons/Tool/f90.py
@@ -42,12 +42,6 @@ import fortran
 compilers = ['f90']
 
 #
-F90Action = SCons.Action.Action("$F90COM")
-ShF90Action = SCons.Action.Action("$SHF90COM")
-F90PPAction = SCons.Action.Action("$F90PPCOM")
-ShF90PPAction = SCons.Action.Action("$SHF90PPCOM")
-
-#
 F90Suffixes = ['.f90']
 F90PPSuffixes = []
 if SCons.Util.case_sensitive_suffixes('.f90', '.F90'):
@@ -62,10 +56,24 @@ for suffix in F90Suffixes + F90PPSuffixes:
     SCons.Defaults.ObjSourceScan.add_scanner(suffix, F90Scan)
 
 #
-F90Generator = fortran.VariableListGenerator('F90', 'FORTRAN', '_FORTRAND')
-F90FlagsGenerator = fortran.VariableListGenerator('F90FLAGS', 'FORTRANFLAGS')
-ShF90Generator = fortran.VariableListGenerator('SHF90', 'SHFORTRAN', 'F90', 'FORTRAN', '_FORTRAND')
-ShF90FlagsGenerator = fortran.VariableListGenerator('SHF90FLAGS', 'SHFORTRANFLAGS')
+fVLG = fortran.VariableListGenerator
+
+F90Generator = fVLG('F90', 'FORTRAN', '_FORTRAND')
+F90FlagsGenerator = fVLG('F90FLAGS', 'FORTRANFLAGS')
+F90CommandGenerator = fVLG('F90COM', 'FORTRANCOM', '_F90COMD')
+F90PPCommandGenerator = fVLG('F90PPCOM', 'FORTRANPPCOM', '_F90PPCOMD')
+ShF90Generator = fVLG('SHF90', 'SHFORTRAN', 'F90', 'FORTRAN', '_FORTRAND')
+ShF90FlagsGenerator = fVLG('SHF90FLAGS', 'SHFORTRANFLAGS')
+ShF90CommandGenerator = fVLG('SHF90COM', 'SHFORTRANCOM', '_SHF90COMD')
+ShF90PPCommandGenerator = fVLG('SHF90PPCOM', 'SHFORTRANPPCOM', '_SHF90PPCOMD')
+
+del fVLG
+
+#
+F90Action = SCons.Action.Action('$_F90COMG ')
+F90PPAction = SCons.Action.Action('$_F90PPCOMG ')
+ShF90Action = SCons.Action.Action('$_SHF90COMG ')
+ShF90PPAction = SCons.Action.Action('$_SHF90PPCOMG ')
 
 def add_to_env(env):
     """Add Builders and construction variables for f90 to an Environment."""
@@ -76,32 +84,36 @@ def add_to_env(env):
     for suffix in F90Suffixes:
         static_obj.add_action(suffix, F90Action)
         shared_obj.add_action(suffix, ShF90Action)
-        static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter)
-        shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter)
+        static_obj.add_emitter(suffix, fortran.FortranEmitter)
+        shared_obj.add_emitter(suffix, fortran.ShFortranEmitter)
 
     for suffix in F90PPSuffixes:
         static_obj.add_action(suffix, F90PPAction)
         shared_obj.add_action(suffix, ShF90PPAction)
-        static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter)
-        shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter)
+        static_obj.add_emitter(suffix, fortran.FortranEmitter)
+        shared_obj.add_emitter(suffix, fortran.ShFortranEmitter)
   
-    env['_F90G']      = F90Generator
-    env['_F90FLAGSG'] = F90FlagsGenerator
-    env['F90COM']     = '$_F90G $_F90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
-    env['F90PPCOM']   = '$_F90G $_F90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
+    env['_F90G']        = F90Generator
+    env['_F90FLAGSG']   = F90FlagsGenerator
+    env['_F90COMG']     = F90CommandGenerator
+    env['_F90PPCOMG']   = F90PPCommandGenerator
 
     env['_SHF90G']      = ShF90Generator
     env['_SHF90FLAGSG'] = ShF90FlagsGenerator
-    env['SHF90COM']   = '$_SHF90G $_SHF90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
-    env['SHF90PPCOM'] = '$_SHF90G $_SHF90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
+    env['_SHF90COMG']   = ShF90CommandGenerator
+    env['_SHF90PPCOMG'] = ShF90PPCommandGenerator
 
     env['_F90INCFLAGS'] = '$( ${_concat(INCPREFIX, F90PATH, INCSUFFIX, __env__, RDirs)} $)'
+    env['_F90COMD']     = '$_F90G $_F90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
+    env['_F90PPCOMD']   = '$_F90G $_F90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
+    env['_SHF90COMD']   = '$_SHF90G $_SHF90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
+    env['_SHF90PPCOMD'] = '$_SHF90G $_SHF90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES'
 
 def generate(env):
     fortran.add_to_env(env)
     add_to_env(env)
 
-    env['_FORTRAND'] = env.Detect(compilers) or 'f90'
+    env['_FORTRAND']        = env.Detect(compilers) or 'f90'
 
 def exists(env):
     return env.Detect(compilers)