Bug 1410148 - Fully re-enable debug info on mac builds. r=gps
--- 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'))