summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1640982
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <evgeniy@khramtsov.org>2022-01-28 02:30:16 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2022-01-28 21:59:37 +0100
commit7b007c9d1e67ccffc09f0b60d1d039cc7f8af693 (patch)
tree124cb6a96266f43481007b179b0c8027b6e2ac5e /www/firefox/files/patch-bug1640982
parentdevel/glib20: update to 2.70.3 (diff)
www/firefox: update to 96.0.3
PR: 261410 Reported by: Stefan Ehmann Tested by: Stefan Ehmann (prior v0.3), jbeich (PipeWire screen capture) (prior v0.8 via mail), cmt (prior v0.8 + 96.0.3 bump)
Diffstat (limited to 'www/firefox/files/patch-bug1640982')
-rw-r--r--www/firefox/files/patch-bug164098216
1 files changed, 10 insertions, 6 deletions
diff --git a/www/firefox/files/patch-bug1640982 b/www/firefox/files/patch-bug1640982
index dae6ca5fa7b5..15789b617616 100644
--- a/www/firefox/files/patch-bug1640982
+++ b/www/firefox/files/patch-bug1640982
@@ -2,14 +2,18 @@ Unbreak build with Rust 1.45.0
error: options `-C embed-bitcode=no` and `-C lto` are incompatible
---- config/makefiles/rust.mk.orig 2020-05-12 09:36:22 UTC
+--- config/makefiles/rust.mk.orig 2020-05-12 09:36:22 UTC
+
+diff --git config/makefiles/rust.mk config/makefiles/rust.mk
+index 75570d3..94ec33f 100644
+--- config/makefiles/rust.mk
+++ config/makefiles/rust.mk
-@@ -61,7 +61,7 @@ ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
- # gkrust_gtest.
+@@ -97,7 +97,7 @@ ifndef rustflags_sancov
+ # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
+ ifndef MOZ_CODE_COVERAGE
ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
-cargo_rustc_flags += -Clto
+cargo_rustc_flags +=
endif
- endif
- endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes