[zorg] r217403 - Fix build breakage when CXXFLAGS is empty

[Jonathan Roelofs]

Author: jroelofs
Date: Mon Sep  8 15:52:07 2014
New Revision: 217403

URL: http://llvm.org/viewvc/llvm-project?rev=217403&view=rev
Log:
Fix build breakage when CXXFLAGS is empty

This fixes a bug introduced in r217265

Modified:
    zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=217403&r1=217402&r2=217403&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Mon Sep  8 15:52:07 2014
@@ -60,13 +60,16 @@ def getLibcxxAndAbiBuilder(f=None, env={
     f = getLibcxxWholeTree(f, src_root)
 
     if 'libcxxabi-has-no-threads' in additional_features:
-        env['CXXFLAGS'] += ' -DLIBCXXABI_HAS_NO_THREADS=1'
+        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
+                           ' -DLIBCXXABI_HAS_NO_THREADS=1')
 
     if 'libcpp-has-no-threads' in additional_features:
-        env['CXXFLAGS'] += ' -D_LIBCPP_HAS_NO_THREADS'
+        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
+                           ' -D_LIBCPP_HAS_NO_THREADS')
 
     if 'libcpp-has-no-monotonic-clock' in additional_features:
-        env['CXXFLAGS'] += ' -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK'
+        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
+                           ' -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK')
 
     litTestArgs = ''
     if additional_features: