|
1 # HG changeset patch |
|
2 # User msirringhaus@suse.de |
|
3 # Date 1560754926 -7200 |
|
4 # Mon Jun 17 09:02:06 2019 +0200 |
|
5 # Node ID 428161c3b9599083e1b8710eda1760f1f707ab11 |
|
6 # Parent 6cd963b6c82ea6629aaf4050851789b78f310338 |
|
7 #Description: reduce the rust debuginfo level on selected architectures where |
|
8 # compiling with debuginfo=2 causes the OOM killer to interrupt the build on |
|
9 # launchpad builders. Initially this was only on 32 bit architectures, but with |
|
10 # firefox 63 it started happening frequently on arm64 and ppc64el too. |
|
11 |
|
12 diff -r 6cd963b6c82e -r 428161c3b959 build/moz.configure/toolchain.configure |
|
13 --- a/build/moz.configure/toolchain.configure Tue May 21 17:26:58 2019 +0200 |
|
14 +++ b/build/moz.configure/toolchain.configure Mon Jun 17 09:02:06 2019 +0200 |
|
15 @@ -1865,8 +1865,8 @@ |
|
16 return '1' if moz_optimize.optimize else '0' |
|
17 |
|
18 |
|
19 -@depends(rustc_opt_level, debug_rust, '--enable-debug-symbols') |
|
20 -def rust_compile_flags(opt_level, debug_rust, debug_symbols): |
|
21 +@depends(rustc_opt_level, debug_rust, '--enable-debug-symbols', host) |
|
22 +def rust_compile_flags(opt_level, debug_rust, debug_symbols, host): |
|
23 # Cargo currently supports only two interesting profiles for building: |
|
24 # development and release. Those map (roughly) to --enable-debug and |
|
25 # --disable-debug in Gecko, respectively. |
|
26 @@ -1889,6 +1889,8 @@ |
|
27 |
|
28 if debug_symbols: |
|
29 debug_info = '2' |
|
30 + if host.bitness == 32 or host.cpu == 'aarch64' or host.cpu == 'ppc64': |
|
31 + debug_info = '1' |
|
32 |
|
33 opts = [] |
|
34 |