Bug 1434659 - move --enable-oom-breakpoint to moz.configure; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Wed, 31 Jan 2018 14:35:57 -0500
changeset 456871 1d3724ca38b1855d7348e53970d855cbf4df8faf
parent 456870 70d7179a4c9dc1fd43e77e2347709da2b8cde46f
child 456872 c783229694e5ed33b553b7825d753aa247844d7f
child 456873 b5a46d76193b991dbe533913e75280b079f2e4a8
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1434659
milestone60.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 1434659 - move --enable-oom-breakpoint to moz.configure; r=nalexander
build/moz.configure/old.configure
js/moz.configure
js/src/old-configure.in
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -197,17 +197,16 @@ def old_configure_options(*options):
     '--enable-maintenance-service',
     '--enable-memory-sanitizer',
     '--enable-mobile-optimize',
     '--enable-necko-wifi',
     '--enable-negotiateauth',
     '--enable-nfc',
     '--enable-nspr-build',
     '--enable-official-branding',
-    '--enable-oom-breakpoint',
     '--enable-parental-controls',
     '--enable-pie',
     '--enable-posix-nspr-emulation',
     '--enable-pref-extensions',
     '--enable-pulseaudio',
     '--enable-raw',
     '--enable-readline',
     '--enable-reflow-perf',
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -315,16 +315,25 @@ js_option('--enable-trace-logging',
           help='Enable trace logging')
 
 set_config('ENABLE_TRACE_LOGGING',
            depends_if('--enable-trace-logging')(lambda x: True))
 set_define('JS_TRACE_LOGGING',
            depends_if('--enable-trace-logging')(lambda x: True))
 
 
+# Enable breakpoint for artificial OOMs
+# =======================================================
+js_option('--enable-oom-breakpoint',
+          help='Enable a breakpoint function for artificial OOMs')
+
+set_define('JS_OOM_BREAKPOINT',
+           depends_if('--enable-oom-breakpoint')(lambda _: True))
+
+
 js_option('--enable-perf', env='JS_ION_PERF',
           help='Enable Linux perf integration')
 
 @depends('--enable-perf')
 def ion_perf(value):
     if value:
         return True
 
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1491,28 +1491,16 @@ fi
 dnl ========================================================
 dnl Debug (see Bug 939505)
 dnl ========================================================
 if test -n "$MOZ_DEBUG"; then
     AC_DEFINE(JS_DEBUG)
 fi
 
 dnl ========================================================
-dnl Enable breakpoint for artificial OOMs
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(oom-breakpoint,
-[  --enable-oom-breakpoint
-                          Enable a breakpoint function for artificial OOMs],
-    JS_OOM_BREAKPOINT=1,
-    JS_OOM_BREAKPOINT= )
-if test -n "$JS_OOM_BREAKPOINT"; then
-    AC_DEFINE(JS_OOM_BREAKPOINT)
-fi
-
-dnl ========================================================
 dnl = Enable using the clang plugin to build
 dnl ========================================================
 
 if test -n "$COMPILE_ENVIRONMENT"; then
 MOZ_CONFIG_CLANG_PLUGIN
 fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================