Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: build/config/c++/c++.gni

Issue 2965693002: Revert of Switch Chrome on Linux to libc++ (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/linux/debian/expected_deps_ia32_jessie » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/c++/c++.gni
diff --git a/build/config/c++/c++.gni b/build/config/c++/c++.gni
index 5a62670afafef626d726682de03ba524f2a956c3..e83c50ecfa9be30fe0319d4a9d20032c2bcb3f53 100644
--- a/build/config/c++/c++.gni
+++ b/build/config/c++/c++.gni
@@ -12,12 +12,8 @@
# Use libc++ (buildtools/third_party/libc++ and
# buildtools/third_party/libc++abi) instead of stdlibc++ as standard
# library.
- # TODO(thomasanderson): Clean up this complex condition. The
- # is_tsan, is_msan, and (use_libfuzzer && !is_mac), clauses can be
- # removed since they are only used on non-CrOs Linux. is_ubsan can
- # probably also be removed for the same reason.
use_custom_libcxx =
- (is_linux && !is_chromeos && (!is_chromecast || is_cast_desktop_build)) ||
- is_tsan || is_msan || is_ubsan || is_ubsan_security ||
- (use_libfuzzer && !is_mac) || use_afl
+ (is_asan && is_linux && !is_chromeos &&
+ (!is_chromecast || is_cast_desktop_build)) || is_tsan || is_msan ||
+ is_ubsan || is_ubsan_security || (use_libfuzzer && !is_mac) || use_afl
}
« no previous file with comments | « no previous file | chrome/installer/linux/debian/expected_deps_ia32_jessie » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698