4d23b9e031
* chore: bump chromium in DEPS to 644eb098aeffb5e799ab3571eac0d35fa24ef641 * chore: update chromium patches * chore: update v8 patches * chore: bump chromium in DEPS to 9eecb7a9f652bbf84f6437b49c70922b65b38bf3 * chore: update patches
20 lines
790 B
Diff
20 lines
790 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nitish Sakhawalkar <nitsakh@icloud.com>
|
|
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 834a943deca28655f40490ab78a14496e253c143..7abf6d83b04b515881c8f797e1031082afe7a5c8 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"))
|
|
|