diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2023-09-05 06:18:03 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-09-07 01:52:02 -0400 |
| commit | 6642f41236ef08f6470c6b36779b46cccd0e51a9 (patch) | |
| tree | 997d4d98a68b60e50d7472a130b13ea61cbc8498 /libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch | |
| parent | 8b2f7d7824ef82c258101e19cc8453ed2d34ffaf (diff) | |
[iceweasel]: tweak for i686
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 | 19 |
1 files changed, 10 insertions, 9 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 c9ae89cb4..b8217d5db 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,7 +1,8 @@ -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 @@ +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +index 5d1d547..a04aeaf 100644 +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -450,17 +450,17 @@ $(RUST_LIBRARY_FILE): $(CARGO_FILE) $(if $(RUST_LIBRARY_DEPS),$(RUST_LIBRARY_DEP # 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. @@ -10,7 +11,7 @@ diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk -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 $@) +- $(call py_action,check_binary,--networking $@) -endif -endif -endif @@ -19,14 +20,14 @@ diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk +#ifndef MOZ_PROFILE_GENERATE +#ifeq ($(OS_ARCH), Linux) +#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) -+#ifndef MOZ_LTO_RUST ++#ifndef MOZ_LTO_RUST_CROSS +#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) -+# $(call py_action,check_binary,--target --networking $@) ++# $(call py_action,check_binary,--networking $@) +#endif +#endif +#endif +#endif +#endif - force-cargo-library-check: - $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) + define make_default_rule + $(1): |