diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index b5ccb10a5f58..3ad2a20b084e 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -70,3 +70,4 @@ revert_build_swiftshader_for_arm32.patch fix_disable_usage_of_abort_report_np_in_mas_builds.patch fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch fix_disable_usage_of_setapplicationisdaemon_and.patch +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 000000000000..f8a5b9fbdaef --- /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: Samuel Attard +Date: Fri, 29 Mar 2019 11:04:46 -0700 +Subject: disable custom libcxx on windows + + +diff --git a/build/config/c++/c++.gni b/build/config/c++/c++.gni +index 5d45ff18455275e2ab416030fb01b103c7a630cf..39774eb51b112e02a9aa9c5288e8b52e33fdcb17 100644 +--- a/build/config/c++/c++.gni ++++ b/build/config/c++/c++.gni +@@ -13,7 +13,8 @@ declare_args() { + # TODO(https://crbug.com/942939): Re-enable libc++ on Windows with libfuzzer. + use_custom_libcxx = + is_fuchsia || is_android || is_mac || +- (is_win && is_clang && !use_libfuzzer) || ++ # Do not use custom libcxx on windows ++ # (is_win && is_clang && !use_libfuzzer) || + (is_linux && + (!is_chromeos || default_toolchain != "//build/toolchain/cros:target")) +