# HG changeset patch # User msirringhaus@suse.de # Date 1560754926 -7200 # Mon Jun 17 09:02:06 2019 +0200 # Node ID 428161c3b9599083e1b8710eda1760f1f707ab11 # Parent 6cd963b6c82ea6629aaf4050851789b78f310338 #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 # firefox 63 it started happening frequently on arm64 and ppc64el too. diff -r 6cd963b6c82e -r 428161c3b959 build/moz.configure/toolchain.configure --- a/build/moz.configure/toolchain.configure Tue May 21 17:26:58 2019 +0200 +++ b/build/moz.configure/toolchain.configure Mon Jun 17 09:02:06 2019 +0200 @@ -1865,8 +1865,8 @@ return '1' if moz_optimize.optimize else '0' -@depends(rustc_opt_level, debug_rust, '--enable-debug-symbols') -def rust_compile_flags(opt_level, debug_rust, debug_symbols): +@depends(rustc_opt_level, debug_rust, '--enable-debug-symbols', host) +def rust_compile_flags(opt_level, debug_rust, debug_symbols, 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. @@ -1889,6 +1889,8 @@ if debug_symbols: debug_info = '2' + if host.bitness == 32 or host.cpu == 'aarch64' or host.cpu == 'ppc64': + debug_info = '1' opts = []