diff options
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Util.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 579811e..d9a397f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -113,6 +113,11 @@ RELEASE 0.97 - XXX for another target, to avoid trying to build it again when it comes up in the target list. + From Wayne Lee: + + - Avoid "maximum recursion limit" errors when removing $(-$) pairs + from long command lines. + From Clive Levinson: - Make ParseConfig() recognize and add -mno-cygwin to $LINKFLAGS and diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index b713b57..b2bae65 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -509,7 +509,7 @@ SUBST_RAW = 1 SUBST_SIG = 2 _rm = re.compile(r'\$[()]') -_remove = re.compile(r'\$\(([^\$]|\$[^\(])*?\$\)') +_remove = re.compile(r'\$\([^\$]*(\$[^\)][^\$]*)*\$\)') # Indexed by the SUBST_* constants above. _regex_remove = [ _rm, None, _remove ] |