Fix breakpad 32-bit build.

buildbot/buildbot_standard.py

Index: buildbot/buildbot_standard.py
diff --git a/buildbot/buildbot_standard.py b/buildbot/buildbot_standard.py
index e492041a2f483b06ddc7a99bd682aee3e95f03b9..59d75fb6f95a0d5ec69923c08e36fd8682453014 100644
--- a/buildbot/buildbot_standard.py
+++ b/buildbot/buildbot_standard.py
@@ -400,16 +400,18 @@ def BuildScript(status, context):
       # hoping that the host toolchain will provide support.
       configure_args = []
       if context.Linux():
-        cxx = 'CXX=../../third_party/llvm-build/Release+Asserts/bin/clang++ '
+        cc = 'CXX=../../third_party/llvm-build/Release+Asserts/bin/clang'

[Derek Schuff, 2016/10/14 17:31:07]

Should this be CC=?

[bradn, 2016/10/14 17:35:09]

Yep

+        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)