about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.patch
diff options
context:
space:
mode:
authoremilylange <git@emilylange.de>2024-06-12 03:35:30 +0200
committeremilylange <git@emilylange.de>2024-06-12 03:35:30 +0200
commit7f36179f17f5893535a055d1246714b86790baf7 (patch)
tree8669ce854fdc46ee0ec39e15ed08b5c705ed6622 /pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.patch
parentbda04d27a0c0a482d3506d74f367f96155392e66 (diff)
chromium: rebase patches for M126
Note that we can't just update previous patches in place, as that would
prevent electron-source and ungoogled-chrome (< M126) from building.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.patch')
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.patch
new file mode 100644
index 0000000000000..776655babdd2a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.patch
@@ -0,0 +1,21 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 6efe967eb0a1c..2ddae4efacbfa 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1653,16 +1653,6 @@ config("runtime_library") {
+     configs += [ "//build/config/c++:runtime_library" ]
+   }
+ 
+-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
+-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
+-  # library. The Rust symbols are marked as weak, so that they can be replaced by
+-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in
+-  # order to cause that replacement to occur by explicitly linking in clang's
+-  # compiler-rt library.
+-  if (is_clang && toolchain_has_rust) {
+-    configs += [ "//build/config/clang:compiler_builtins" ]
+-  }
+-
+   # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
+   # configuration.
+   if (is_posix || is_fuchsia) {