diff options
Diffstat (limited to 'www/chromium/files/patch-base_BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-base_BUILD.gn | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 725a7d08b332..c655ae27d7f5 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,15 +1,15 @@ ---- base/BUILD.gn.orig 2017-12-15 02:04:05.000000000 +0100 -+++ base/BUILD.gn 2017-12-30 01:18:00.438461000 +0100 -@@ -1125,7 +1125,7 @@ +--- base/BUILD.gn.orig 2018-12-03 21:16:32.000000000 +0100 ++++ base/BUILD.gn 2018-12-05 13:50:51.133919000 +0100 +@@ -1182,7 +1182,7 @@ # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. - if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && + if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && host_toolchain != "//build/toolchain/cros:host") { - libs = [ "atomic" ] + libs += [ "atomic" ] } -@@ -1151,7 +1151,7 @@ +@@ -1208,7 +1208,7 @@ "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,16 +18,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1539,7 +1539,7 @@ - "//base/third_party/xdg_user_dirs", - ] - } else { -- # Non-Linux. -+ # Non-Linux/BSD. - sources -= [ - "nix/mime_util_xdg.cc", - "nix/mime_util_xdg.h", -@@ -1555,6 +1555,33 @@ +@@ -1740,6 +1740,33 @@ } } @@ -61,7 +52,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2389,6 +2416,12 @@ +@@ -2753,6 +2780,12 @@ ] set_sources_assignment_filter(sources_assignment_filter) } |