summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-12-09 16:21:40 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-12-22 14:25:39 (GMT)
commitd6bb5d79e3726d2aad82b52fe637030177b4950f (patch)
treeb2f4c74a1592825582f82d88d74ae3b85b42665b /BuildTools
parent2b7f55a30b07f08d32bccd3ea0a72ffd8c820c20 (diff)
downloadswift-d6bb5d79e3726d2aad82b52fe637030177b4950f.zip
swift-d6bb5d79e3726d2aad82b52fe637030177b4950f.tar.bz2
Replace MergeFlags calls by UseFlags calls.
Change-Id: If7193006987fd86d102e5e17aac426ef1a6ccd83
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/Tools/Flags.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/Flags.py b/BuildTools/SCons/Tools/Flags.py
index 13fbb32..c130faf 100644
--- a/BuildTools/SCons/Tools/Flags.py
+++ b/BuildTools/SCons/Tools/Flags.py
@@ -3,7 +3,10 @@ import SCons.Util
def generate(env) :
def useFlags(env, flags) :
for flag in flags :
- env[flag] = env.get(flag, []) + flags[flag]
+ if flag in env :
+ env[flag] = env[flag] + flags[flag]
+ else :
+ env[flag] = flags[flag]
env.AddMethod(useFlags, "UseFlags")
def exists(env) :