[zorg] r199789 - We want to build lld with libc++ and nightly tests with gcc47.

[Galina Kistanova]

Author: gkistanova
Date: Tue Jan 21 22:54:32 2014
New Revision: 199789

URL: http://llvm.org/viewvc/llvm-project?rev=199789&view=rev
Log:
We want to build lld with libc++ and nightly tests with gcc47.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=199789&r1=199788&r2=199789&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Jan 21 22:54:32 2014
@@ -364,6 +364,8 @@ def _get_clang_builders():
                                                                merge_functions=True,
                                                                make='gmake',
                                                                test=False,
+                                                               env={'CC'  : '/usr/local/bin/gcc47',
+                                                                    'CXX' : '/usr/local/bin/g++47'},
                                                                xfails=clang_x86_64_freeBSD9_xfails)},
 
         # Clang cross builders.
@@ -736,7 +738,8 @@ def _get_lld_builders():
         {'name': "lld-x86_64-freeBSD",
          'slavenames' :["as-bldslv5"],
          'builddir':"lld-x86_64-freeBSD",
-         'factory': LLDBuilder.getLLDBuildFactory(jobs=32),
+         'factory': LLDBuilder.getLLDBuildFactory(jobs=32,
+                                                  env={'CXXFLAGS' : "-stdlib=libc++"}),
          'category'   : 'lld'},
 
         {'name': "lld-powerpc-linux-debian",