diff options
| author | Steven Knight <knight@baldmt.com> | 2003-12-02 04:36:32 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-12-02 04:36:32 (GMT) |
| commit | a5be48b5b4511b3097bbcfe82868d9f6eb32300d (patch) | |
| tree | 37c694a62a8f355c3cf8659ce41f5eb3900b1a98 | |
| parent | b044c7d46a734e8d35e4f651376e76f6f13f6b86 (diff) | |
| download | SCons-a5be48b5b4511b3097bbcfe82868d9f6eb32300d.zip SCons-a5be48b5b4511b3097bbcfe82868d9f6eb32300d.tar.gz SCons-a5be48b5b4511b3097bbcfe82868d9f6eb32300d.tar.bz2 | |
Fix an incorrect _concat() call in the definition for the mingw Tool. (Chad Austin)
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 08e007a..8e1054a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -20,6 +20,9 @@ RELEASE 0.95 - XXX - Accomodate the fact that Cygwin's os.path.normcase() lies about the underlying system being case-sensitive. + - Fix an incorrect _concat() call in the $RCINCFLAGS definition for + the mingw Tool. + From David M. Cooke: - Make the Fortran scanner case-insensitive for the INCLUDE string. diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index cd18bb5..bc3693d 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -132,7 +132,7 @@ def generate(env): env['RC'] = 'windres' env['RCFLAGS'] = '' - env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, locals(), globals(), RDirs)} $)' + env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs)} $)' env['RCINCPREFIX'] = '--include-dir ' env['RCINCSUFFIX'] = '' env['RCCOM'] = '$RC $RCINCFLAGS $RCFLAGS -i $SOURCE -o $TARGET' |