diff options
Diffstat (limited to 'www/chromium/files/patch-build_config_compiler_BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-build_config_compiler_BUILD.gn | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index b79fed03d255..00964ebeb5f6 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2019-01-30 02:17:39.000000000 +0100 -+++ build/config/compiler/BUILD.gn 2019-01-31 21:56:18.122280000 +0100 -@@ -53,7 +53,7 @@ +--- build/config/compiler/BUILD.gn.orig 2019-03-11 22:00:52 UTC ++++ build/config/compiler/BUILD.gn +@@ -53,7 +53,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. linux_use_bundled_binutils = @@ -9,7 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -274,7 +274,7 @@ +@@ -275,7 +275,7 @@ config("compiler") { # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && !(is_android && use_order_profiling) && !is_mac && !is_ios && @@ -18,7 +18,7 @@ # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 # crbug.com/485542 -@@ -393,7 +393,7 @@ +@@ -394,7 +394,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -501,7 +501,7 @@ +@@ -502,7 +502,7 @@ config("compiler") { } } @@ -36,7 +36,7 @@ cflags += [ # TODO(hans): Remove this once Clang generates better optimized debug info # by default. https://crbug.com/765793 -@@ -808,7 +808,7 @@ +@@ -809,7 +809,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,35 +45,25 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1488,11 +1488,13 @@ - if (current_toolchain == host_toolchain || !use_xcode_clang) { +@@ -1494,7 +1494,7 @@ config("default_warnings") { + cflags += [ "-Wno-nonportable-include-path" ] + } + +- if (current_toolchain == host_toolchain || !use_xcode_clang) { ++ if ((current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. -- cflags += [ -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", -- ] -+ if (!is_bsd) { -+ cflags += [ -+ # Ignore warnings about MSVC optimization pragmas. -+ # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -+ "-Wno-ignored-pragma-optimize", -+ ] -+ } - if (is_fuchsia) { - cflags += [ - # TODO(hans): https://crbug.com/890307 -@@ -1684,7 +1686,7 @@ + cflags += [ +@@ -1694,7 +1694,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). - if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { + if ((is_posix && !is_nacl && !is_mac && !is_ios && !is_bsd) || is_fuchsia) { arflags = [ "-T" ] - } - } -@@ -2269,7 +2271,7 @@ + } else if (is_win && use_lld) { + arflags = [ "/llvmlibthin" ] +@@ -2278,7 +2278,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -82,7 +72,7 @@ } } if (use_debug_fission && !is_nacl && !is_android) { -@@ -2290,7 +2292,7 @@ +@@ -2299,7 +2299,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && |