From 335612432609021a3a3d682f99241d7bdd373f40 Mon Sep 17 00:00:00 2001
From: Chris Xiong <chirs241097@gmail.com>
Date: Sun, 4 Feb 2024 00:55:17 -0500
Subject: more confusion
---
.../chromium/files/chromium-123-compiler.patch | 25 +++++++++++++---------
1 file changed, 15 insertions(+), 10 deletions(-)
(limited to 'www-client/chromium/files')
diff --git a/www-client/chromium/files/chromium-123-compiler.patch b/www-client/chromium/files/chromium-123-compiler.patch
index baf3deb..6faf9b7 100644
--- a/www-client/chromium/files/chromium-123-compiler.patch
+++ b/www-client/chromium/files/chromium-123-compiler.patch
@@ -1,5 +1,5 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index a91928eeac..ea3333c50c 100644
+index a91928eeac..afc87ad613 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -322,9 +322,6 @@ config("compiler") {
@@ -78,15 +78,6 @@ index a91928eeac..ea3333c50c 100644
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -816,7 +767,7 @@ config("compiler") {
- if (!is_android || current_cpu == "arm64") {
- cflags += [ "-fwhole-program-vtables" ]
-
-- if (toolchain_supports_rust_thin_lto) {
-+ if (toolchain_supports_rust_thin_lto && !toolchain_supports_rust_thin_lto) {
- # whole-program-vtables implies -fsplit-lto-unit, and Rust needs to match
- # behaviour. Rust needs to know the linker will be doing LTO in this case
- # or it rejects the Zsplit-lto-unit flag.
@@ -1013,17 +964,6 @@ config("compiler") {
# `-nodefaultlibs` from the linker invocation from Rust, which would be used
# to compile dylibs on Android, such as for constructing unit test APKs.
@@ -310,3 +301,17 @@ index a91928eeac..ea3333c50c 100644
if (is_win) {
ldflags = [ "/DEBUG" ]
+diff --git a/build/config/rust.gni b/build/config/rust.gni
+index 9b0ee754ba..a438ed231c 100644
+--- a/build/config/rust.gni
++++ b/build/config/rust.gni
+@@ -75,7 +75,8 @@ declare_args() {
+ #
+ # TODO(https://crbug.com/1482525): Re-enable ThinLTO for Rust on LaCrOS
+ # TODO(b/300937673): Re-enable ThinLTO for Rust on ash-chrome
+- toolchain_supports_rust_thin_lto = !is_chromeos
++ # toolchain_supports_rust_thin_lto = !is_chromeos
++ toolchain_supports_rust_thin_lto = false
+
+ # Any extra std rlibs in your Rust toolchain, relative to the standard
+ # Rust toolchain. Typically used with 'rust_sysroot_absolute'
--
cgit v1.2.3