diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
| commit | 340d57481935334465037d97c0db1555b70c0eb1 (patch) | |
| tree | 8396a9a52eed6e40268c1916bcfa8957dddef71c /engine/SCons/Tool/ifort.py | |
| parent | 86baccee0a1dddf43f7eefe48e2d9e9037468b9c (diff) | |
Imported Upstream version 2.0.0upstream/2.0.0
Diffstat (limited to 'engine/SCons/Tool/ifort.py')
| -rw-r--r-- | engine/SCons/Tool/ifort.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engine/SCons/Tool/ifort.py b/engine/SCons/Tool/ifort.py index 047afba..06bf484 100644 --- a/engine/SCons/Tool/ifort.py +++ b/engine/SCons/Tool/ifort.py @@ -32,9 +32,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/ifort.py 4720 2010/03/24 03:14:11 jars" - -import string +__revision__ = "src/engine/SCons/Tool/ifort.py 5023 2010/06/14 22:05:46 scons" import SCons.Defaults from SCons.Scanner.Fortran import FortranScan @@ -48,12 +46,12 @@ def generate(env): SCons.Tool.SourceFileScanner.add_scanner('.i', fscan) SCons.Tool.SourceFileScanner.add_scanner('.i90', fscan) - if not env.has_key('FORTRANFILESUFFIXES'): + if 'FORTRANFILESUFFIXES' not in env: env['FORTRANFILESUFFIXES'] = ['.i'] else: env['FORTRANFILESUFFIXES'].append('.i') - if not env.has_key('F90FILESUFFIXES'): + if 'F90FILESUFFIXES' not in env: env['F90FILESUFFIXES'] = ['.i90'] else: env['F90FILESUFFIXES'].append('.i90') @@ -75,7 +73,7 @@ def generate(env): for dialect in ['F77', 'F90', 'FORTRAN', 'F95']: for var in ['%sCOM' % dialect, '%sPPCOM' % dialect, 'SH%sCOM' % dialect, 'SH%sPPCOM' % dialect]: - env[var] = string.replace(env[var], '-o $TARGET', '-object:$TARGET') + env[var] = env[var].replace('-o $TARGET', '-object:$TARGET') env['FORTRANMODDIRPREFIX'] = "/module:" else: env['FORTRANMODDIRPREFIX'] = "-module " |