Bug 1267901 - Fix --disable-replace-malloc on Nightly after bug 1257448. r=glandium
authorJan Beich <jbeich@FreeBSD.org>
Wed, 27 Apr 2016 02:53:17 +0000
changeset 295807 e93c12bc1ffc281c95f9a0ba614266a90cf8c257
parent 295806 a25f97b1cf4d4a973650eff89c7f194fc92e82d4
child 295808 d2312946398362c71f6424304e4cdd0da7e66e85
push id76095
push usercbook@mozilla.com
push dateTue, 03 May 2016 08:48:23 +0000
treeherdermozilla-inbound@e93c12bc1ffc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1267901, 1257448
milestone49.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 1267901 - Fix --disable-replace-malloc on Nightly after bug 1257448. r=glandium MozReview-Commit-ID: HbsrH0M6wLE
build/moz.configure/memory.configure
--- a/build/moz.configure/memory.configure
+++ b/build/moz.configure/memory.configure
@@ -81,17 +81,18 @@ set_define(jemalloc_os_define_android, '
 
 
 option('--enable-replace-malloc',
        help='Enable ability to dynamically replace the malloc implementation')
 
 @depends('--enable-replace-malloc', jemalloc, milestone, build_project)
 def replace_malloc(value, jemalloc, milestone, build_project):
     # Enable on central for the debugging opportunities it adds.
+    if value and not jemalloc:
+        die('--enable-replace-malloc requires --enable-jemalloc')
+    if value.origin != 'default':
+        return bool(value) or None
     if milestone.is_nightly and jemalloc and build_project != 'js':
         return True
-    if value and not jemalloc:
-        die('--enable-replace-malloc requires --enable-jemalloc')
-    return bool(value) or None
 
 set_config('MOZ_REPLACE_MALLOC', replace_malloc)
 set_define('MOZ_REPLACE_MALLOC', replace_malloc)
 add_old_configure_assignment('MOZ_REPLACE_MALLOC', replace_malloc)