diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2020-08-07 18:01:37 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-08-11 09:57:20 -0400 |
| commit | 82318eb61934ddaf04d17c046fab7bdd3177f69e (patch) | |
| tree | 5cddfd20f2d1939ead28177de59b23db8bc93032 /libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch | |
| parent | dae0301d94eae96bd4efa534c17d91d4371d57e8 (diff) | |
[iceweasel]: sync with arch32 (broken)
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.patch | 26 |
1 files changed, 12 insertions, 14 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 index a35a8b732..7bcbde2a8 100644 --- a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch +++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch @@ -1,8 +1,6 @@ -diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk -index df11844..6f75d0a 100644 ---- a/config/makefiles/rust.mk -+++ b/config/makefiles/rust.mk -@@ -299,15 +299,15 @@ $(RUST_LIBRARY_FILE): force-cargo-library-build +--- firefox-79.0/config/makefiles/rust.mk 2020-07-21 00:49:36.000000000 +0200 ++++ firefox-79.0-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk 2020-08-02 13:56:36.118444982 +0200 +@@ -299,15 +299,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. @@ -15,15 +13,15 @@ index df11844..6f75d0a 100644 -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 ++#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) |