Fix breakpad 32-bit build.

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 382 matching lines @@
 
   # 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++ '
+        cc = 'CC=../../third_party/llvm-build/Release+Asserts/bin/clang'
+        cxx = 'CXX=../../third_party/llvm-build/Release+Asserts/bin/clang++'
+        flags = ''
         if context['arch'] == '32':
-          cxx += '-m32'
+          flags += ' -m32'
           sysroot_arch = 'i386'
         else:
-          cxx += '-m64'
+          flags += ' -m64'
           sysroot_arch = 'amd64'
-        cxx += (' --sysroot=../../build/linux/debian_wheezy_%s-sysroot' %
-                sysroot_arch)
-        configure_args += [cxx]
+        flags += (' --sysroot=../../build/linux/debian_wheezy_%s-sysroot' %
+                  sysroot_arch)
+        configure_args += [cc + flags, cxx + flags]
         configure_args += ['CXXFLAGS=-I../..']  # For third_party/lss
       Command(context, cwd='breakpad-out',
               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
@@ skipping 75 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()