summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-01-18 08:10:05 +0100
committerErich Eckner <git@eckner.net>2021-01-18 08:10:05 +0100
commitc62a42a0d40c381bddbabc63152f4e30386b51b0 (patch)
treea01937baa0d9ed89f64b7403328a6b86f44622d3
parentf96d79a0832209d7233dc6e4ec22937366a7614c (diff)
downloadpackages-c62a42a0d40c381bddbabc63152f4e30386b51b0.tar.xz
extra/firefox: patch changed - thanks to mistersmee
-rw-r--r--extra/firefox/rust-static-disable-network-test-on-static-libraries.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch
index ba9e98c3..c9ae89cb 100644
--- a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch
+++ b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch
@@ -1,14 +1,14 @@
diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
--- a/config/makefiles/rust.mk 2020-10-13 20:23:09.920635480 +0200
+++ b/config/makefiles/rust.mk 2020-10-13 20:24:02.273994137 +0200
-@@ -310,17 +310,17 @@
+@@ -324,17 +324,17 @@
# the chance of proxy bypasses originating from rust code.
- # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST.
+ # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
# Sanitizers and sancov also fail because compiler-rt hooks network functions.
-ifndef MOZ_PROFILE_GENERATE
-ifeq ($(OS_ARCH), Linux)
-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
--ifndef MOZ_LTO_RUST
+-ifndef MOZ_LTO_RUST_CROSS
-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
- $(call py_action,check_binary,--target --networking $@)
-endif