Merged in williamblevins/scons (pull request #352)

4 files changed, 6 insertions, 31 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index a515684c..98b2f00c 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -958,32 +958,6 @@ SConscript( sconscript )
     # to use cygwin compilers on cmd.exe -> uncomment following line
     #Configure_lib = 'm'
 
-    def gccFortranLibs(self):
-        """Test which gcc Fortran startup libraries are required.
-        This should probably move into SCons itself, but is kind of hacky.
-        """
-        if sys.platform.find('irix') != -1:
-            return ['ftn']
-
-        libs = ['g2c']
-        cmd = ['gcc','-v']
-
-        try:
-            p = Popen(cmd, stdout=PIPE, stderr=PIPE)
-            stdout, stderr = p.communicate()
-        except:
-            return libs
-
-        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):
-                libs = ['gfortranbegin']
-            elif gcc_version in ('3.1', '4.0'):
-                libs = ['frtbegin'] + libs
-
-        return libs
-
     def skip_if_not_msvc(self, check_platform=True):
         """ Check whether we are on a Windows platform and skip the
             test if not. This check can be omitted by setting
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 282e80be..361af21d 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -29,6 +29,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Added LoadableModule to the list of global functions (DefaultEnvironment
       builders).
 
+
   From William Blevins:
     - Updated D language scanner support to latest: 2.071.1. (PR #1924)
       https://dlang.org/spec/module.html accessed 11 August 2016
@@ -39,6 +40,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       - Notes:
         - May find new (previously missed) Dlang dependencies.
         - May cause rebuild after upgrade due to dependency changes.
+    - Updated Fortran-related tests to pass under GCC 5/6.
+
 
 RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
 
diff --git a/test/Fortran/FORTRAN.py b/test/Fortran/FORTRAN.py
index 4a2529c3..9a01fa68 100644
--- a/test/Fortran/FORTRAN.py
+++ b/test/Fortran/FORTRAN.py
@@ -87,7 +87,6 @@ test.must_match('test08' + _exe, "This is a .FPP file.\n")
 
 fc = 'f77'
 f77 = test.detect_tool(fc)
-FTN_LIB = test.gccFortranLibs()
 
 if f77:
 
diff --git a/test/VariantDir/VariantDir.py b/test/VariantDir/VariantDir.py
index 00926927..1b620bbc 100644
--- a/test/VariantDir/VariantDir.py
+++ b/test/VariantDir/VariantDir.py
@@ -28,7 +28,6 @@ import TestSCons
 _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
-fortran_runtime = test.gccFortranLibs()
 
 fortran = test.detect('FORTRAN')
 
@@ -118,9 +117,9 @@ except:
 
 if fortran and env.Detect(fortran):
     env.Command(target='b2.f', source='b2.in', action=buildIt)
-    env.Clone(LIBS = %s).Program(target='bar2', source='b2.f')
-    env.Clone(LIBS = %s).Program(target='bar1', source='b1.f')
-""" % (fortran_runtime, fortran_runtime))
+    env.Clone().Program(target='bar2', source='b2.f')
+    env.Clone().Program(target='bar1', source='b1.f')
+""")
 
 test.write(['work1', 'src', 'f1.c'], r"""
 #include <stdio.h>