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 a243ee5f7f31fba3d9480d33ced3846ec62923ee..9509002b4be0d08b56ab05f8e966fc351799be34 100644 (file)
--- 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 88fe749f17c7d647b54713e6e6b586c250b1b9fe..ff74caa6d54d430ffb03f922a11b8038fc3a3586 100644 (file)
--- 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