[llvm-commits] [zorg] r169863 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py zorg/buildbot/builders/LLDBBuilder.py

[Daniel Malea]

Author: dmalea
Date: Tue Dec 11 07:24:40 2012
New Revision: 169863

URL: http://llvm.org/viewvc/llvm-project?rev=169863&view=rev
Log:
Update LLDB builder to propagate environment to make invocation
- also update CXXFLAGS for LLDB build


Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=169863&r1=169862&r2=169863&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Dec 11 07:24:40 2012
@@ -512,7 +512,7 @@
          'slavenames': ["gcc20"],
          'builddir': "lldb-x86_64",
          'factory': LLDBBuilder.getLLDBBuildFactory(triple="x86_64-pc-linux-gnu",
-                                                    env={'CXXFLAGS' : '-std=gnu++11'})},
+                                                    env={'CXXFLAGS' : '-std=c++0x'})},
         {'name': "lldb-x86_64-darwin11",
          'slavenames': ["xserve1"],
          'builddir': "build.lldb-x86_64-darwin11",

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=169863&r1=169862&r2=169863&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Tue Dec 11 07:24:40 2012
@@ -76,12 +76,14 @@
 
     f.addStep(Configure(name='configure',
         command=config_args,
+        env=env,
         workdir=llvm_objdir))
 
     f.addStep(WarningCountingShellCommand(name="compile",
                                           command=['nice', '-n', '10',
                                           'make', WithProperties("-j%s" % jobs)
                                           ],
+                                          env=env,
                                           haltOnFailure=True,
                                           workdir=llvm_objdir))