summaryrefslogtreecommitdiffstats
path: root/testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff
diff options
context:
space:
mode:
Diffstat (limited to 'testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff')
-rw-r--r--testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff27
1 files changed, 27 insertions, 0 deletions
diff --git a/testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff b/testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff
new file mode 100644
index 000000000..759809277
--- /dev/null
+++ b/testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff
@@ -0,0 +1,27 @@
+--- ./config/makefiles/rust.mk.orig 2020-08-04 21:42:49.000000000 -0500
++++ ./config/makefiles/rust.mk 2020-08-24 21:44:11.930497037 -0500
+@@ -303,15 +303,15 @@
+ # the chance of proxy bypasses originating from rust code.
+ # The check only works when rust code is built with -Clto.
+ # 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))
+-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
+- $(call py_action,check_binary,--target --networking $@)
+-endif
+-endif
+-endif
+-endif
++#ifndef MOZ_PROFILE_GENERATE
++#ifeq ($(OS_ARCH), Linux)
++#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
++#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
++# $(call py_action,check_binary,--target --networking $@)
++#endif
++#endif
++#endif
++#endif
+
+ force-cargo-library-check:
+ $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)