| Index: buildbot/buildbot_standard.py
|
| diff --git a/buildbot/buildbot_standard.py b/buildbot/buildbot_standard.py
|
| index e492041a2f483b06ddc7a99bd682aee3e95f03b9..83e1f500f06baf0effe96da226d2205eaf05a378 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 = '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)
|
|
|