Bug 1410148 - Fully re-enable debug info on mac builds. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 28 Dec 2017 18:01:50 +0900
changeset 397514 5fa379ef34e98a308d09c00a36a00ef50db108bc
parent 397513 8696ea0008279d20a8305b5e81134cd1368f12fa
child 397515 78f2064b3811db58b364c32ce9b58a3f2dcaf8f8
push id33168
push usernbeleuzu@mozilla.com
push dateSat, 30 Dec 2017 21:57:07 +0000
treeherdermozilla-central@1861d00189d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1410148
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1410148 - Fully re-enable debug info on mac builds. r=gps
build/moz.configure/toolchain.configure
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1334,19 +1334,19 @@ js_option(env='RUSTC_OPT_LEVEL',
           nargs=1,
           help='Rust compiler optimization level (-C opt-level=%s)')
 
 # --enable-release kicks in full optimizations.
 imply_option('RUSTC_OPT_LEVEL', '2', when='--enable-release')
 
 
 @depends('RUSTC_OPT_LEVEL', debug_rust, '--enable-debug-symbols',
-         moz_optimize, host, target)
+         moz_optimize)
 def rust_compiler_flags(opt_level_option, debug_rust, debug_symbols,
-                        moz_optimize, host, target):
+                        moz_optimize):
     optimize = moz_optimize.optimize
 
     # Cargo currently supports only two interesting profiles for building:
     # development and release. Those map (roughly) to --enable-debug and
     # --disable-debug in Gecko, respectively.
     #
     # But we'd also like to support an additional axis of control for
     # optimization level. Since Cargo only supports 2 profiles, we're in
@@ -1366,21 +1366,17 @@ def rust_compiler_flags(opt_level_option
         opt_level = '1' if optimize else '0'
 
     # opt-level=0 implies -C debug-assertions, which may not be desired
     # unless Rust debugging is enabled.
     if opt_level == '0' and not debug_rust:
         debug_assertions = False
 
     if debug_symbols:
-        if host.kernel == 'Linux' and target.kernel == 'Darwin':
-            # hack to work around dsymutil failing on cross-OSX builds (bug 1410148)
-            debug_info = '0'
-        else:
-            debug_info = '2'
+        debug_info = '2'
 
     opts = []
 
     if opt_level is not None:
         opts.append('opt-level=%s' % opt_level)
     if debug_assertions is not None:
         opts.append('debug-assertions=%s' %
                     ('yes' if debug_assertions else 'no'))