diff -r a9cd24eaa361 -r 7fa561e5d7c7 mozilla-reduce-rust-debuginfo.patch --- a/mozilla-reduce-rust-debuginfo.patch Sat Mar 07 09:48:10 2020 +0100 +++ b/mozilla-reduce-rust-debuginfo.patch Mon Mar 30 21:49:01 2020 +0200 @@ -3,7 +3,7 @@ # Date 1560754926 -7200 # Mon Jun 17 09:02:06 2019 +0200 # Node ID 428161c3b9599083e1b8710eda1760f1f707ab11 -# Parent fa1cf8b9cb4efdf89fe19e543fb54272b726a353 +# Parent 83625bab561d09fb68aa2c71cea7cbafd9ec09b4 #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,7 +12,7 @@ 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 -@@ -1861,18 +1861,18 @@ imply_option('RUSTC_OPT_LEVEL', '2', whe +@@ -1823,18 +1823,18 @@ imply_option('RUSTC_OPT_LEVEL', '2', whe @depends('RUSTC_OPT_LEVEL', moz_optimize) def rustc_opt_level(opt_level_option, moz_optimize): if opt_level_option: @@ -33,7 +33,7 @@ # optimization level. Since Cargo only supports 2 profiles, we're in # a bit of a bind. # -@@ -1885,16 +1885,18 @@ def rust_compile_flags(opt_level, debug_ +@@ -1847,16 +1847,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.