From cae2f1f537e82562f1955b17c05c778020c766ea Mon Sep 17 00:00:00 2001 From: Nitish Sakhawalkar Date: Mon, 13 May 2019 15:51:17 -0700 Subject: [PATCH] Disable custom libcxx patch --- .../disable_custom_libcxx_on_windows.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 patches/common/chromium/disable_custom_libcxx_on_windows.patch diff --git a/patches/common/chromium/disable_custom_libcxx_on_windows.patch b/patches/common/chromium/disable_custom_libcxx_on_windows.patch new file mode 100644 index 0000000000..e4437b1ce3 --- /dev/null +++ b/patches/common/chromium/disable_custom_libcxx_on_windows.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nitish Sakhawalkar +Date: Mon, 13 May 2019 15:48:36 -0700 +Subject: Disable custom libcxx on windows + + +diff --git a/build/config/c++/c++.gni b/build/config/c++/c++.gni +index b639ca7793c2a5d97df0a02efc462c476c3640d0..c6d543d781fe30574f671ee22e84ab0b95a50ccb 100644 +--- a/build/config/c++/c++.gni ++++ b/build/config/c++/c++.gni +@@ -12,7 +12,8 @@ declare_args() { + # is not supported. + use_custom_libcxx = + is_fuchsia || is_android || is_mac || (is_ios && !use_xcode_clang) || +- (is_win && is_clang) || ++ # Do not use custom libcxx on windows ++ #(is_win && is_clang) || + (is_linux && + (!is_chromeos || default_toolchain != "//build/toolchain/cros:target")) +