diff options
| author | William Blevins <wblevins001@gmail.com> | 2016-08-10 00:10:09 (GMT) |
|---|---|---|
| committer | William Blevins <wblevins001@gmail.com> | 2016-08-10 00:10:09 (GMT) |
| commit | 5a7b42144f99ff62bd4f2b81b47a038c415d61cf (patch) | |
| tree | 1be93b0f741cf58c939f9e00bb1420992b0a59b7 /QMTest | |
| parent | 1d93e3871ee6858e3bc362aa4e9822c29aadb1a3 (diff) | |
| download | SCons-5a7b42144f99ff62bd4f2b81b47a038c415d61cf.zip SCons-5a7b42144f99ff62bd4f2b81b47a038c415d61cf.tar.gz SCons-5a7b42144f99ff62bd4f2b81b47a038c415d61cf.tar.bz2 | |
Updated QMTest fortran lib setup for versions GCC 5/6 (and higher*).
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index a515684..2d4df3a 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -977,7 +977,9 @@ SConscript( sconscript ) m = re.search('(gcc\s+version|gcc-Version)\s+(\d\.\d)', stderr) if m: gcc_version = m.group(2) - if re.match('4.[^0]', gcc_version): + if re.match('[5-9].\d', gcc_version): + libs = ['gfortran'] + elif re.match('4.[^0]', gcc_version): libs = ['gfortranbegin'] elif gcc_version in ('3.1', '4.0'): libs = ['frtbegin'] + libs |