[zorg] r200728 - Changed environment for builders

Galina Kistanova gkistanova at gmail.com
Mon Feb 3 17:00:23 PST 2014


Author: gkistanova
Date: Mon Feb  3 19:00:22 2014
New Revision: 200728

URL: http://llvm.org/viewvc/llvm-project?rev=200728&view=rev
Log:
Changed environment for builders 
clang-x86_64-darwin11-cross-mingw32,
clang-x86_64-darwin11-self-mingw32,
clang-x86_64-darwin11-cross-arm.

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=200728&r1=200727&r2=200728&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Feb  3 19:00:22 2014
@@ -387,6 +387,9 @@ def _get_clang_builders():
          'builddir' :"clang-x86_64-darwin11-cross-mingw32",
          'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True,
                                                        test=False,
+                                                       env = { 'CC' : 'clang',
+                                                               'CXX' : 'clang++',
+                                                               'CXXFLAGS' : '-stdlib=libc++'},
                                                        extra_configure_args=['--build=x86_64-apple-darwin11',
                                                                              '--host=x86_64-apple-darwin11',
                                                                              '--target=i686-pc-mingw32'])},
@@ -395,7 +398,10 @@ def _get_clang_builders():
          'slavenames':["as-bldslv11"],
          'builddir':"clang-x86_64-darwin11-self-mingw32",
          'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, test=False,
-                                                       env = { 'PATH' : "/mingw_build_tools/install_with_gcc/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin"},
+                                                       env = { 'PATH' : "/mingw_build_tools/install_with_gcc/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin",
+                                                               'CC' : 'clang',
+                                                               'CXX' : 'clang++',
+                                                               'CXXFLAGS' : '-stdlib=libc++'},
                                                        extra_configure_args=['--build=x86_64-apple-darwin11',
                                                                              '--host=i686-pc-mingw32',
                                                                              '--target=i686-pc-mingw32'])},
@@ -404,6 +410,9 @@ def _get_clang_builders():
          'slavenames' :["as-bldslv11"],
          'builddir' :"clang-x86_64-darwin11-cross-arm",
          'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True,
+                                                       env = { 'CC' : 'clang',
+                                                               'CXX' : 'clang++',
+                                                               'CXXFLAGS' : '-stdlib=libc++'},
                                                        test=False,
                                                        extra_configure_args=['--build=x86_64-apple-darwin11',
                                                                              '--host=x86_64-apple-darwin11',





More information about the llvm-commits mailing list