From: Mike Hommey Date: Sun, 14 Aug 2022 06:05:23 +0000 (+0900) Subject: Allow to override rust LTO flag X-Git-Tag: archive/raspbian/115.14.0esr-1+rpi1^2~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84a904825e038c584939ee9af113366c49ec5945;p=firefox-esr.git Allow to override rust LTO flag Gbp-Pq: Topic debian-hacks Gbp-Pq: Name Allow-to-override-rust-LTO-flag.patch --- diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk index 894e2b341a5..cbe955a0ef3 100644 --- a/config/makefiles/rust.mk +++ b/config/makefiles/rust.mk @@ -92,8 +92,9 @@ ifndef rustflags_sancov # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. ifndef MOZ_CODE_COVERAGE ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) -cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) +cargo_rustc_flags += $(or $(DEBIAN_RUST_LTO),-Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)) endif +ifneq (-Clto=off,$(DEBIAN_RUST_LTO)) # We need -Cembed-bitcode=yes for all crates when using -Clto. RUSTFLAGS += -Cembed-bitcode=yes endif @@ -101,6 +102,7 @@ endif endif endif endif +endif ifdef CARGO_INCREMENTAL export CARGO_INCREMENTAL