From f30704396e0a6d4dd7c49c85494de445df68655a Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sun, 22 Jan 2023 07:44:28 -0700 Subject: gfortran - remove some debug prints [skip appveyor] One of the tests had some debug fluff left over - cleaned. Reworded the CHANGES blurb and added one to RELEASE. Signed-off-by: Mats Wichmann --- CHANGES.txt | 7 ++++--- RELEASE.txt | 6 ++++++ test/Fortran/SHF95FLAGS.py | 6 ------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index c2bb504..aaa44a0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -107,9 +107,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER looked up through a node ended up generating a Python SyntaxError because it was passed through scons_subst(). - Have the gfortran tool do a better job of honoring user preferences - for the dialect tools (F95, SHF95, etc.). Previously set those - unconditionally to 'gfortran'. Cleaned a few Fortran tests - - behavior does not change. + for the dialect tools (F95, SHF95, etc.). Previously these were + unconditionally forced to 'gfortran'; the change should be more + in line with expectations of how these variables should work. + Also cleaned a few Fortran tests - test behavior does not change. RELEASE 4.4.0 - Sat, 30 Jul 2022 14:08:29 -0700 diff --git a/RELEASE.txt b/RELEASE.txt index 35fd845..703bf7b 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -71,6 +71,12 @@ FIXES the compilation step for the source/target pair. - A refactor in the caching logic for version 4.4.0 left Java inner classes failing with an exception when a CacheDir was enabled. This is now corrected. +- When using the gfortran tool (the default on most platforms as long as a GNU + toolchain is installed), the user setting of the "dialect" compilers + (F77, F90, F03 and F09, as well as the shared-library complements SHF77, + SHF90, SHF03, SHF09) is now honored; previously the tool forced the + settings to 'gfortran', which made it difficult reference a cross-compile + version for dialects. IMPROVEMENTS diff --git a/test/Fortran/SHF95FLAGS.py b/test/Fortran/SHF95FLAGS.py index 7aaca56..dcec49b 100644 --- a/test/Fortran/SHF95FLAGS.py +++ b/test/Fortran/SHF95FLAGS.py @@ -89,14 +89,8 @@ if g95: test.write('SConstruct', """ foo = Environment(SHF95='%(fc)s') shf95 = foo.Dictionary('SHF95') -#print(f"foo SHF95={foo.Dictionary('SHF95')}", file=sys.stderr) -#print(f"foo F95FLAGS={foo.Dictionary('F95FLAGS')}", file=sys.stderr) -#print(f"foo SHF95FLAGS={foo.Dictionary('SHF95FLAGS')}", file=sys.stderr) bar = foo.Clone(SHF95=r'%(_python_)s wrapper.py ' + shf95) bar.Append(SHF95FLAGS='-Ix') -#print(f"bar SHF95={bar.Dictionary('SHF95')}", file=sys.stderr) -#print(f"bar F95FLAGS={bar.Dictionary('F95FLAGS')}", file=sys.stderr) -#print(f"bar SHF95FLAGS={bar.Dictionary('SHF95FLAGS')}", file=sys.stderr) foo.SharedLibrary(target='foo/foo', source='foo.f95') bar.SharedLibrary(target='bar/bar', source='bar.f95') """ % locals()) -- cgit v0.12