1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1560754926 -7200 |
3 # Date 1560754926 -7200 |
4 # Mon Jun 17 09:02:06 2019 +0200 |
4 # Mon Jun 17 09:02:06 2019 +0200 |
5 # Node ID 428161c3b9599083e1b8710eda1760f1f707ab11 |
5 # Node ID 428161c3b9599083e1b8710eda1760f1f707ab11 |
6 # Parent fa1cf8b9cb4efdf89fe19e543fb54272b726a353 |
6 # Parent 83625bab561d09fb68aa2c71cea7cbafd9ec09b4 |
7 #Description: reduce the rust debuginfo level on selected architectures where |
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 |
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 |
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. |
10 # firefox 63 it started happening frequently on arm64 and ppc64el too. |
11 |
11 |
12 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure |
12 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure |
13 --- a/build/moz.configure/toolchain.configure |
13 --- a/build/moz.configure/toolchain.configure |
14 +++ b/build/moz.configure/toolchain.configure |
14 +++ b/build/moz.configure/toolchain.configure |
15 @@ -1861,18 +1861,18 @@ imply_option('RUSTC_OPT_LEVEL', '2', whe |
15 @@ -1823,18 +1823,18 @@ imply_option('RUSTC_OPT_LEVEL', '2', whe |
16 @depends('RUSTC_OPT_LEVEL', moz_optimize) |
16 @depends('RUSTC_OPT_LEVEL', moz_optimize) |
17 def rustc_opt_level(opt_level_option, moz_optimize): |
17 def rustc_opt_level(opt_level_option, moz_optimize): |
18 if opt_level_option: |
18 if opt_level_option: |
19 return opt_level_option[0] |
19 return opt_level_option[0] |
20 else: |
20 else: |
31 # |
31 # |
32 # But we'd also like to support an additional axis of control for |
32 # But we'd also like to support an additional axis of control for |
33 # optimization level. Since Cargo only supports 2 profiles, we're in |
33 # optimization level. Since Cargo only supports 2 profiles, we're in |
34 # a bit of a bind. |
34 # a bit of a bind. |
35 # |
35 # |
36 @@ -1885,16 +1885,18 @@ def rust_compile_flags(opt_level, debug_ |
36 @@ -1847,16 +1847,18 @@ def rust_compile_flags(opt_level, debug_ |
37 |
37 |
38 # opt-level=0 implies -C debug-assertions, which may not be desired |
38 # opt-level=0 implies -C debug-assertions, which may not be desired |
39 # unless Rust debugging is enabled. |
39 # unless Rust debugging is enabled. |
40 if opt_level == '0' and not debug_rust: |
40 if opt_level == '0' and not debug_rust: |
41 debug_assertions = False |
41 debug_assertions = False |