From 1769d394743cc1e4a1814beeab2250311e7c3cbf Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Sun, 14 Aug 2022 15:05:23 +0900 Subject: [PATCH] Allow to override rust LTO flag Gbp-Pq: Topic debian-hacks Gbp-Pq: Name Allow-to-override-rust-LTO-flag.patch --- config/makefiles/rust.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk index 524bc436fdf..d97b94c495e 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 -- 2.30.2