summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-10-11 13:32:37 (GMT)
committerSteven Knight <knight@baldmt.com>2008-10-11 13:32:37 (GMT)
commit95792a5c83ee9cc31b24beec4e49e255bcc6f0fd (patch)
tree823a1ea3bcf61ffd77a877cdde5d933dcf3e6a2f
parentcc283be5b5ff852b39116b55232567db4b2b7922 (diff)
downloadSCons-95792a5c83ee9cc31b24beec4e49e255bcc6f0fd.zip
SCons-95792a5c83ee9cc31b24beec4e49e255bcc6f0fd.tar.gz
SCons-95792a5c83ee9cc31b24beec4e49e255bcc6f0fd.tar.bz2
Fix our SCons.Util.CLVar implementation (__add__() and __radd__()
methods) so env.{Ap,Pre}pend() work under Python 2.6 when appending strings to $*FLAGS variables.
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/engine/SCons/Util.py4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index ad77dee..c02d27a 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -15,6 +15,9 @@ RELEASE 1.1.0 - Thu, 09 Oct 2008 08:33:47 -0700
- Fix label placement by the "scons-time.py func" subcommand
when a profile value was close to (or equal to) 0.0.
+ - Fix env.Append() and env.Prepend()'s ability to add a string to
+ list-like variables like $CCFLAGS under Python 2.6.
+
RELEASE 1.X - XXX
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 7ea3673..641db9c 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -1022,6 +1022,10 @@ class CLVar(UserList):
"""
def __init__(self, seq = []):
UserList.__init__(self, Split(seq))
+ def __add__(self, other):
+ return UserList.__add__(self, CLVar(other))
+ def __radd__(self, other):
+ return UserList.__radd__(self, CLVar(other))
def __coerce__(self, other):
return (self, CLVar(other))
def __str__(self):