From e81707d24e90598ea275b98a30227faad2d9f17a Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 16 Sep 2022 11:39:59 -0400 Subject: why --- .../chromium/files/chromium-107-compiler.patch | 34 ++++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'www-client/chromium/files') diff --git a/www-client/chromium/files/chromium-107-compiler.patch b/www-client/chromium/files/chromium-107-compiler.patch index ac28240..1d059c4 100644 --- a/www-client/chromium/files/chromium-107-compiler.patch +++ b/www-client/chromium/files/chromium-107-compiler.patch @@ -1,5 +1,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 665b42c3b..8d73754a0 100644 +index 665b42c3b..26b141903 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -274,9 +274,7 @@ config("compiler") { @@ -98,7 +98,17 @@ index 665b42c3b..8d73754a0 100644 # Tells the compiler not to use absolute paths when passing the default # paths to the tools it invokes. We don't want this because we don't # really need it and it can mess up the goma cache entries. -@@ -1616,7 +1542,7 @@ config("chromium_code") { +@@ -1310,7 +1236,8 @@ config("compiler_deterministic") { + } + } + +-config("clang_revision") { ++config("clang_revision") { } ++config("xclang_revision") { + if (is_clang && clang_base_path == default_clang_base_path) { + update_args = [ + "--print-revision", +@@ -1616,7 +1543,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -107,7 +117,7 @@ index 665b42c3b..8d73754a0 100644 if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1625,10 +1551,6 @@ config("chromium_code") { +@@ -1625,10 +1552,6 @@ config("chromium_code") { # well. ldflags = [ "-Werror" ] } @@ -118,7 +128,7 @@ index 665b42c3b..8d73754a0 100644 # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -1637,16 +1559,6 @@ config("chromium_code") { +@@ -1637,16 +1560,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -135,7 +145,7 @@ index 665b42c3b..8d73754a0 100644 if (is_mac) { cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -2041,7 +1953,8 @@ config("default_stack_frames") { +@@ -2041,7 +1954,8 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -145,7 +155,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -2086,7 +1999,8 @@ config("optimize") { +@@ -2086,7 +2000,8 @@ config("optimize") { } # Turn off optimizations. @@ -155,7 +165,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2126,7 +2040,8 @@ config("no_optimize") { +@@ -2126,7 +2041,8 @@ config("no_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -165,7 +175,7 @@ index 665b42c3b..8d73754a0 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2159,7 +2074,8 @@ config("optimize_max") { +@@ -2159,7 +2075,8 @@ config("optimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -175,7 +185,7 @@ index 665b42c3b..8d73754a0 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2185,7 +2101,8 @@ config("optimize_speed") { +@@ -2185,7 +2102,8 @@ config("optimize_speed") { } } @@ -185,7 +195,7 @@ index 665b42c3b..8d73754a0 100644 cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2305,7 +2222,8 @@ config("win_pdbaltpath") { +@@ -2305,7 +2223,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -195,7 +205,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2430,7 +2348,8 @@ config("symbols") { +@@ -2430,7 +2349,8 @@ config("symbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -205,7 +215,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2502,7 +2421,8 @@ config("minimal_symbols") { +@@ -2502,7 +2422,8 @@ config("minimal_symbols") { # This configuration contains function names only. That is, the compiler is # told to not generate debug information and the linker then just puts function # names in the final debug information. -- cgit v1.2.3