summaryrefslogtreecommitdiff
path: root/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch')
-rw-r--r--libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
new file mode 100644
index 000000000..f5e0f6a0a
--- /dev/null
+++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
@@ -0,0 +1,32 @@
+diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
+--- firefox-72.0.1/config/makefiles/rust.mk 2020-01-08 02:23:30.000000000 +0100
++++ firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk 2020-01-10 12:17:40.172666172 +0100
+@@ -292,17 +292,17 @@
+ # the chance of proxy bypasses originating from rust code.
+ # The check only works when rust code is built with -Clto.
+ # Enabling sancov or TSan also causes this to fail.
+-ifndef MOZ_PROFILE_GENERATE
+-ifndef MOZ_TSAN
+-ifeq ($(OS_ARCH), Linux)
+-ifeq (,$(rustflags_sancov))
+-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
+- $(call py_action,check_binary,--target --networking $@)
+-endif
+-endif
+-endif
+-endif
+-endif
++#ifndef MOZ_PROFILE_GENERATE
++#ifndef MOZ_TSAN
++#ifeq ($(OS_ARCH), Linux)
++#ifeq (,$(rustflags_sancov))
++#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
++# $(call py_action,check_binary,--target --networking $@)
++#endif
++#endif
++#endif
++#endif
++#endif
+
+ force-cargo-library-check:
+ $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)