summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-10-27 11:22:02 (GMT)
committerSteven Knight <knight@baldmt.com>2004-10-27 11:22:02 (GMT)
commitdd9a6d52a84c445b7516fc80b72f2baa3bc8b937 (patch)
tree9d59419a813718c769363ce4ce5e924607dab434 /src/engine
parent94bc4b290d761fb360892545995ff43c799787ad (diff)
downloadSCons-dd9a6d52a84c445b7516fc80b72f2baa3bc8b937.zip
SCons-dd9a6d52a84c445b7516fc80b72f2baa3bc8b937.tar.gz
SCons-dd9a6d52a84c445b7516fc80b72f2baa3bc8b937.tar.bz2
Improved regular expression for removing pairs from command-line strings. (Wayne Lee)
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Util.py2
1 files changed, 1 insertions, 1 deletions
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 ]