rust-static-disable-network-test-on-static-libraries.patch 1.1 KB

12345678910111213141516171819202122232425262728293031323334
  1. diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
  2. index 5d1d547..a04aeaf 100644
  3. --- a/config/makefiles/rust.mk
  4. +++ b/config/makefiles/rust.mk
  5. @@ -450,17 +450,17 @@ $(RUST_LIBRARY_FILE): $(CARGO_FILE) $(if $(RUST_LIBRARY_DEPS),$(RUST_LIBRARY_DEP
  6. # the chance of proxy bypasses originating from rust code.
  7. # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
  8. # Sanitizers and sancov also fail because compiler-rt hooks network functions.
  9. -ifndef MOZ_PROFILE_GENERATE
  10. -ifeq ($(OS_ARCH), Linux)
  11. -ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
  12. -ifndef MOZ_LTO_RUST_CROSS
  13. -ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
  14. - $(call py_action,check_binary,--networking $@)
  15. -endif
  16. -endif
  17. -endif
  18. -endif
  19. -endif
  20. +#ifndef MOZ_PROFILE_GENERATE
  21. +#ifeq ($(OS_ARCH), Linux)
  22. +#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
  23. +#ifndef MOZ_LTO_RUST_CROSS
  24. +#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
  25. +# $(call py_action,check_binary,--networking $@)
  26. +#endif
  27. +#endif
  28. +#endif
  29. +#endif
  30. +#endif
  31. define make_default_rule
  32. $(1):