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