diff options
Diffstat (limited to 'libre/icecat/rust-static-disable-network-test-on-static-libraries.patch')
-rw-r--r-- | libre/icecat/rust-static-disable-network-test-on-static-libraries.patch | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch b/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch index 08915653a..c9ae89cb4 100644 --- a/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch +++ b/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch @@ -1,27 +1,32 @@ ---- config/makefiles/rust.mk -+++ config/makefiles/rust.mk -@@ -304,15 +304,15 @@ +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 +@@ -324,17 +324,17 @@ # the chance of proxy bypasses originating from rust code. - # The check only works when rust code is built with -Clto. + # 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 +#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) |