--- a/mozilla-reduce-rust-debuginfo.patch Sun Jan 24 11:01:55 2021 +0100
+++ b/mozilla-reduce-rust-debuginfo.patch Thu Jan 28 23:39:24 2021 +0100
@@ -3,7 +3,7 @@
# Date 1560754926 -7200
# Mon Jun 17 09:02:06 2019 +0200
# Node ID 428161c3b9599083e1b8710eda1760f1f707ab11
-# Parent f5e9431a99bb1d122ccd76411f08ac6f3236c19f
+# Parent 2a004fe4d56123f6e73a9436d1a290bbfc5e0b6b
#Description: reduce the rust debuginfo level on selected architectures where
# compiling with debuginfo=2 causes the OOM killer to interrupt the build on
# launchpad builders. Initially this was only on 32 bit architectures, but with
@@ -12,20 +12,19 @@
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
-@@ -2138,19 +2138,19 @@ imply_option("RUSTC_OPT_LEVEL", "2", whe
- def rustc_opt_level(opt_level_option, moz_optimize):
- if opt_level_option:
- return opt_level_option[0]
- else:
- return "1" if moz_optimize.optimize else "0"
+@@ -2145,18 +2145,19 @@ def rustc_opt_level(opt_level_option, mo
@depends(
-- rustc_opt_level, debug_rust, "--enable-debug-symbols", "--enable-frame-pointers"
-+ rustc_opt_level, debug_rust, "--enable-debug-symbols", "--enable-frame-pointers", host
+ rustc_opt_level,
+ debug_rust,
+ target,
+ "--enable-debug-symbols",
+ "--enable-frame-pointers",
++ host,
)
--def rust_compile_flags(opt_level, debug_rust, debug_symbols, frame_pointers):
-+def rust_compile_flags(opt_level, debug_rust, debug_symbols, frame_pointers, host):
+-def rust_compile_flags(opt_level, debug_rust, target, debug_symbols, frame_pointers):
++def rust_compile_flags(opt_level, debug_rust, target, debug_symbols, frame_pointers, host):
# Cargo currently supports only two interesting profiles for building:
# development and release. Those map (roughly) to --enable-debug and
# --disable-debug in Gecko, respectively.
@@ -34,7 +33,7 @@
# optimization level. Since Cargo only supports 2 profiles, we're in
# a bit of a bind.
#
-@@ -2163,16 +2163,18 @@ def rust_compile_flags(opt_level, debug_
+@@ -2169,16 +2170,18 @@ def rust_compile_flags(opt_level, debug_
# opt-level=0 implies -C debug-assertions, which may not be desired
# unless Rust debugging is enabled.