diff options
Diffstat (limited to 'source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff')
| -rw-r--r-- | source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff b/source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff new file mode 100644 index 000000000..115ba0e7a --- /dev/null +++ b/source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff @@ -0,0 +1,31 @@ +--- ./config/makefiles/rust.mk.orig 2021-03-15 12:42:08.219987929 -0500 ++++ ./config/makefiles/rust.mk 2021-03-15 12:43:15.996984180 -0500 +@@ -332,17 +332,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_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_CROSS +-ifneq (,$(filter -Clto,$(cargo_rustc_flags))) +- $(call py_action,check_binary,--target --networking $@) +-endif +-endif +-endif +-endif +-endif ++#ifndef MOZ_PROFILE_GENERATE ++#ifeq ($(OS_ARCH), Linux) ++#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) ++#ifndef MOZ_LTO_RUST_CROSS ++#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) |