From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 27 Aug 2022 07:58:37 +0000 (+0000)
Subject: Don't build rust code with Clto to avoid out of memory errors.
X-Git-Tag: archive/raspbian/1%102.1.1-1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a0abbcf457e1e18e8fdf656950505c94453e00b9;p=thunderbird.git

Don't build rust code with Clto to avoid out of memory errors.
---

diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
index a243ee5f7f..9509002b4b 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -90,7 +90,7 @@ 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
+#cargo_rustc_flags += -Clto
 endif
 # We need -Cembed-bitcode=yes for all crates when using -Clto.
 RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/debian/changelog b/debian/changelog
index 88fe749f17..ff74caa6d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,9 @@ thunderbird (1:102.1.1-1+rpi1) bookworm-staging; urgency=medium
   [changes introduced in 1:91.5.1-1+rpi1 by Peter Micheal Green]
   * Further hacks to rust target selection.
 
+  [changes introduced in 1:102.1.1-1+rpi1 by Peter Michael Green]
+  * Don't build rust code with Clto to avoid out of memory errors.
+
  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 11 Aug 2022 12:17:15 +0000
 
 thunderbird (1:102.1.1-1) unstable; urgency=medium