From 491f63197d92a2cd414f0b8e78f90968d1239345 Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Mon, 10 Jul 2017 10:46:31 -0400 Subject: [PATCH] Bug 1370209 - Allow setting --disable-rust-debug when --enable-debug is used. r=froydnj --- moz.configure | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/moz.configure b/moz.configure index e2639a02fd71..1a9566572d54 100755 --- a/moz.configure +++ b/moz.configure @@ -115,15 +115,14 @@ js_option('--enable-debug', add_old_configure_assignment('MOZ_DEBUG', depends('--enable-debug')(lambda v: bool(v))) -imply_option('--enable-rust-debug', - depends('--enable-debug')(lambda v: bool(v) or None)) - js_option('--enable-rust-debug', help='Build Rust code with debug assertions turned on.') -@depends('--enable-rust-debug') -def debug_rust(debug): - if debug: +@depends('--enable-rust-debug', '--enable-debug') +def debug_rust(value, debug): + if value.origin == 'default': + return bool(debug) or None + elif bool(value): return True set_config('MOZ_DEBUG_RUST', debug_rust)