Update linux-syscall-support to 3f6478ac95edf86cd3da300c2c0d34a438f5dbeb

buildbot/buildbot_standard.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Enable 'with' statements in Python 2.5
 from __future__ import with_statement
 
 import os.path
 import platform
@@ skipping 316 matching lines @@
           "find /var/folders -name '.com.google.Chrome*' -exec rm -rfv '{}' ';'",
           shell=True)
 
   # Skip over hooks when run inside the toolchain build because
   # package_version would overwrite the toolchain build.
   if not inside_toolchain:
     with Step('gclient_runhooks', status):
       CommandGclientRunhooks(context)
 
   # Always update Clang.  On Linux and Mac, it's the default for the GN build.
-  # On Windows, we do a second Clang GN build.
+  # It's also used for the Linux Breakpad build. On Windows, we do a second
+  # Clang GN build.
   with Step('update_clang', status):
     Command(context, cmd=[sys.executable, '../tools/clang/scripts/update.py'])
 
   # Make sure our GN build is working.
   using_gn = DoGNBuild(status, context)
   using_gn_clang = False
   if (context.Windows() and
       not context['clang'] and
       context['arch'] in ('32', '64')):
     # On Windows, do a second GN build with is_clang=true.
@@ skipping 39 matching lines @@
     return
 
   # Run checkdeps script to vet #includes.
   with Step('checkdeps', status):
     Command(context, cmd=[sys.executable, 'tools/checkdeps/checkdeps.py'])
 
   # On a subset of Linux builds, build Breakpad tools for testing.
   if context['use_breakpad_tools']:
     with Step('breakpad configure', status):
       Command(context, cmd=['mkdir', '-p', 'breakpad-out'])
+
+      # Breakpad requires C++11, so use clang and the sysroot rather than
+      # hoping that the host toolchain will provide support.
+      configure_args = []
+      if context.Linux():
+        cxx = 'CXX=../../third_party/llvm-build/Release+Asserts/bin/clang++ '
+        if context['arch'] == '32':
+          cxx += '-m32'
+          sysroot_arch = 'i386'
+        else:
+          cxx += '-m64'
+          sysroot_arch = 'amd64'
+        cxx += (' --sysroot=../../build/linux/debian_wheezy_%s-sysroot' %
+                sysroot_arch)
+        configure_args += [cxx]
+        configure_args += ['CXXFLAGS=-I../..']  # For third_party/lss
       Command(context, cwd='breakpad-out',
-              cmd=['bash', '../../breakpad/configure',
-                   'CXXFLAGS=-I../..'])  # For third_party/lss
+              cmd=['bash', '../../breakpad/configure'] + configure_args)
+
     with Step('breakpad make', status):
       Command(context, cmd=['make', '-j%d' % context['max_jobs'],
                             # This avoids a broken dependency on
                             # src/third_party/lss files within the breakpad
                             # source directory.  We are not putting lss
                             # there, but using the -I switch above to
                             # find the lss in ../third_party instead.
                             'includelss_HEADERS=',
                             ],
               cwd='breakpad-out')
@@ skipping 71 matching lines @@
   start_time = time.time()
   try:
     Main()
   finally:
     time_taken = time.time() - start_time
     print 'RESULT BuildbotTime: total= %.3f minutes' % (time_taken / 60)
 
 
 if __name__ == '__main__':
   TimedMain()