From 1581d4da9994af5747b5dde4dd024e0691838f7f Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 14 Dec 2019 11:39:57 +0100 Subject: extra/firefox: redone rust static patch --- ...ust-static-disable-network-test-on-static-libraries.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'extra/firefox/rust-static-disable-network-test-on-static-libraries.patch') diff --git a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch index 32dabb4c..4d6c9ee6 100644 --- a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch +++ b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch @@ -1,23 +1,27 @@ diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk ---- a/config/makefiles/rust.mk 2019-10-25 10:57:20.061421120 +0200 -+++ b/config/makefiles/rust.mk 2019-10-25 11:06:30.065708309 +0200 -@@ -252,13 +252,13 @@ - # that we are not importing any networking-related functions in rust code. This reduces +--- a/config/makefiles/rust.mk 2019-12-02 13:22:52.000000000 +0100 ++++ b/config/makefiles/rust.mk 2019-12-14 11:02:19.896773114 +0100 +@@ -265,15 +265,15 @@ # the chance of proxy bypasses originating from rust code. # The check only works when rust code is built with -Clto. + # Enabling sancov also causes this to fail. -ifndef MOZ_PROFILE_GENERATE -ifeq ($(OS_ARCH), Linux) +-ifeq (,$(rustflags_sancov)) -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)) +#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) +# $(call py_action,check_binary,--target --networking $@) +#endif +#endif ++#endif +#endif force-cargo-library-check: -- cgit v1.2.3-70-g09d2