diff options
| author | Steven Knight <knight@baldmt.com> | 2003-05-27 12:14:50 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-05-27 12:14:50 (GMT) |
| commit | eb18e3716f7c5de0d9bc1399d4e4f4e4c587388a (patch) | |
| tree | 5f9535a11da29058da2460e1aebd97efff9c6bda /test/F77PATH.py | |
| parent | dd46e3d77cb07573d2ff1cb0caed60e5f474cc3c (diff) | |
| download | SCons-eb18e3716f7c5de0d9bc1399d4e4f4e4c587388a.zip SCons-eb18e3716f7c5de0d9bc1399d4e4f4e4c587388a.tar.gz SCons-eb18e3716f7c5de0d9bc1399d4e4f4e4c587388a.tar.bz2 | |
Use -lfrtbegin when linking fortran in gcc3; Cygwin fixes. (Chad Austin)
Diffstat (limited to 'test/F77PATH.py')
| -rw-r--r-- | test/F77PATH.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/test/F77PATH.py b/test/F77PATH.py index f3dd483..af3a9c9 100644 --- a/test/F77PATH.py +++ b/test/F77PATH.py @@ -28,11 +28,7 @@ import os import sys import TestSCons -if sys.platform == 'win32': - _exe = '.exe' -else: - _exe = '' - +_exe = TestSCons._exe FTN_LIB = TestSCons.fortran_lib prog = 'prog' + _exe @@ -49,14 +45,14 @@ if not test.detect('F77', 'g77'): test.subdir('include', 'subdir', ['subdir', 'include'], 'inc2') test.write('SConstruct', """ -env = Environment(F77PATH = ['$FOO'], LIBS = r'%s', FOO='include') +env = Environment(F77PATH = ['$FOO'], LIBS = %s, FOO='include') obj = env.Object(target='foobar/prog', source='subdir/prog.f') env.Program(target='prog', source=obj) SConscript('subdir/SConscript', "env") BuildDir('variant', 'subdir', 0) include = Dir('include') -env = Environment(F77PATH=[include], LIBS = r'%s') +env = Environment(F77PATH=[include], LIBS = %s) SConscript('variant/SConscript', "env") """ % (FTN_LIB, FTN_LIB)) @@ -161,14 +157,14 @@ test.up_to_date(arguments = args) # Change F77PATH and make sure we don't rebuild because of it. test.write('SConstruct', """ -env = Environment(F77PATH = Split('inc2 include'), LIBS = r'%s') +env = Environment(F77PATH = Split('inc2 include'), LIBS = %s) obj = env.Object(target='foobar/prog', source='subdir/prog.f') env.Program(target='prog', source=obj) SConscript('subdir/SConscript', "env") BuildDir('variant', 'subdir', 0) include = Dir('include') -env = Environment(F77PATH=['inc2', include], LIBS = r'%s') +env = Environment(F77PATH=['inc2', include], LIBS = %s) SConscript('variant/SConscript', "env") """ % (FTN_LIB, FTN_LIB)) @@ -196,7 +192,7 @@ test.up_to_date(arguments = args) # Check that a null-string F77PATH doesn't blow up. test.write('SConstruct', """ -env = Environment(F77PATH = '', LIBS = r'%s') +env = Environment(F77PATH = '', LIBS = %s) env.Library('foo', source = 'empty.f') """ % FTN_LIB) |