aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-build_config_allocator.gni
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-build_config_allocator.gni')
-rw-r--r--www/chromium/files/patch-build_config_allocator.gni16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni
index ef4e8f3b8031..d963319c4622 100644
--- a/www/chromium/files/patch-build_config_allocator.gni
+++ b/www/chromium/files/patch-build_config_allocator.gni
@@ -1,15 +1,15 @@
---- build/config/allocator.gni.orig 2017-07-25 21:04:48.000000000 +0200
-+++ build/config/allocator.gni 2017-08-01 23:13:58.535952000 +0200
-@@ -7,7 +7,7 @@
+--- build/config/allocator.gni.orig 2018-06-13 00:10:02.000000000 +0200
++++ build/config/allocator.gni 2018-07-14 13:12:35.947359000 +0200
+@@ -6,7 +6,7 @@
+
# Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
- if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan ||
- is_lsan || is_tsan || is_msan || is_win || is_syzyasan || is_fuchsia ||
-- (is_linux && target_cpu == "arm64")) {
-+ (is_linux && target_cpu == "arm64") || is_bsd) {
+ if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan ||
+- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) {
++ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) {
_default_allocator = "none"
} else {
_default_allocator = "tcmalloc"
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
# against the debug CRT with "is_nacl=false".
if ((is_linux || is_android || is_mac ||
(is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan &&