From f612998fa0500bd11c88aaa0710bf6dc09409d87 Mon Sep 17 00:00:00 2001
From: oprypin <oprypin@webrtc.org>
Date: Tue, 4 Jul 2017 05:41:47 -0700
Subject: [PATCH] Override bots to use libstdc++ on Linux

BUG=webrtc:7922

Review-Url: https://codereview.webrtc.org/2973463003
Cr-Commit-Position: refs/heads/master@{#18890}
---
 tools_webrtc/mb/mb_config.pyl | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index edb5443aa2..5123ff50f1 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -200,7 +200,7 @@
   'configs': {
     # Linux, Mac and Windows
     'gcc_release_bot_x64': [
-      'gn', 'gcc', 'release_bot', 'x64', 'no_rtc_tests'
+      'gn', 'gcc', 'release_bot', 'x64', 'no_rtc_tests', 'use_default_libcxx'
     ],
     # TOOD(kjellander): Restore Goma for this when crbug.com/726706 is fixed.
     'debug_bot_arm': [
@@ -228,7 +228,8 @@
       'gn', 'ubsan', 'clang', 'openh264_release_bot', 'x64'
     ],
     'ubsan_vptr_clang_release_bot_x64': [
-      'gn', 'ubsan_vptr', 'clang', 'openh264_release_bot', 'x64'
+      'gn', 'ubsan_vptr', 'clang', 'openh264_release_bot', 'x64',
+      'use_default_libcxx'
     ],
     'debug_bot_x86': [
       'gn', 'openh264_debug_bot', 'x86'
@@ -256,7 +257,7 @@
       'x64', 'no_rtc_tests'
     ],
     'memcheck_release_bot_x64': [
-      'memcheck', 'gn', 'openh264_release_bot', 'x64'
+      'memcheck', 'gn', 'openh264_release_bot', 'x64', 'use_default_libcxx'
     ],
 
     # iOS
@@ -472,5 +473,9 @@
     'x86': {
       'gn_args': 'target_cpu="x86"',
     },
+
+    'use_default_libcxx': {
+      'gn_args': 'use_custom_libcxx=false',
+    }
   },
 }