diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2010-06-17 02:32:24 (GMT) |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2010-06-17 02:32:24 (GMT) |
commit | be3df70c02915d0c10f11c7f03fe9c1f907490a1 (patch) | |
tree | 12a77471dd7eacc4330aa06664e56250e1a61c13 /src | |
parent | 6c4dc321483d6a2a292fc5b83ccad761d4f5ed5a (diff) | |
download | SCons-be3df70c02915d0c10f11c7f03fe9c1f907490a1.zip SCons-be3df70c02915d0c10f11c7f03fe9c1f907490a1.tar.gz SCons-be3df70c02915d0c10f11c7f03fe9c1f907490a1.tar.bz2 |
Fix #2574: case sensitivity issue with Fortran module scanner.
Diffstat (limited to 'src')
-rw-r--r-- | src/CHANGES.txt | 4 | ||||
-rw-r--r-- | src/engine/SCons/Scanner/Fortran.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7962c57..b784d5c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,6 +7,10 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Joe Zuntz: + + - Fixed a case-sensitivity problem with Fortran modules. + From Bauke Conijn: - Added Users Guide example for auto-generated source code diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py index 29af9aa..1b55130 100644 --- a/src/engine/SCons/Scanner/Fortran.py +++ b/src/engine/SCons/Scanner/Fortran.py @@ -89,11 +89,11 @@ class F90Scanner(SCons.Scanner.Classic): defmodules = self.cre_def.findall(node.get_text_contents()) # Remove all USE'd module names that are defined in the same file + # (case-insensitively) d = {} for m in defmodules: - d[m] = 1 - modules = [m for m in modules if m not in d] - #modules = self.undefinedModules(modules, defmodules) + d[m.lower()] = 1 + modules = [m for m in modules if m.lower() not in d] # Convert module name to a .mod filename suffix = env.subst('$FORTRANMODSUFFIX') |