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.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3672 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index ad77deeae89fad30db4eb408ecd2ce546568f18e..c02d27a61266fbbe082833352516575dd29d4ded 100644 (file)
--- 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 7ea367321a3b5d52404af42c0a3e6e3f8720ca7b..641db9c76d1dbc31501e03ce0442c49539a9605e 100644 (file)
--- 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):