Bug 1293981 - Move --enable-perf to moz.configure. r=chmanchester
authorMs2ger <Ms2ger@gmail.com>
Wed, 10 Aug 2016 13:06:49 +0200
changeset 309194 8c040933f2593ef4771cdb187f66cadcb4b2b5ea
parent 309193 030611acd76621132c94f39bf5a6cb98625157aa
child 309195 18306e1c2b7681cc67311533441479bf50a8f17f
push id30557
push userkwierso@gmail.com
push dateFri, 12 Aug 2016 20:45:15 +0000
treeherdermozilla-central@ef3a50774180 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1293981
milestone51.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 1293981 - Move --enable-perf to moz.configure. r=chmanchester
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
@@ -209,17 +209,16 @@ def old_configure_options(*options):
     '--enable-negotiateauth',
     '--enable-nfc',
     '--enable-nspr-build',
     '--enable-official-branding',
     '--enable-omx-plugin',
     '--enable-oom-breakpoint',
     '--enable-optimize',
     '--enable-parental-controls',
-    '--enable-perf',
     '--enable-permissions',
     '--enable-pie',
     '--enable-png-arm-neon-support',
     '--enable-posix-nspr-emulation',
     '--enable-pref-extensions',
     '--enable-printing',
     '--enable-pulseaudio',
     '--enable-raw',
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -178,8 +178,19 @@ js_option('--enable-gc-trace', env='JS_G
           help='Enable tracing of allocation and finalization')
 
 @depends('--enable-gc-trace')
 def gc_trace(value):
     if value:
         return True
 
 set_define('JS_GC_TRACE', gc_trace)
+
+
+js_option('--enable-perf', env='JS_ION_PERF',
+          help='Enable Linux perf integration')
+
+@depends('--enable-perf')
+def ion_perf(value):
+    if value:
+        return True
+
+set_define('JS_ION_PERF', ion_perf)
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1915,28 +1915,16 @@ MOZ_ARG_ENABLE_BOOL(gczeal,
 [  --enable-gczeal         Enable zealous GCing],
     JS_GC_ZEAL=1,
     JS_GC_ZEAL= )
 if test -n "$JS_GC_ZEAL" -o -n "$MOZ_DEBUG"; then
     AC_DEFINE(JS_GC_ZEAL)
 fi
 
 dnl ========================================================
-dnl = Enable perf logging for ion.
-dnl = Perf logging is OFF by default
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(perf,
-[  --enable-perf           Enable Linux perf integration],
-  JS_ION_PERF=1,
-  JS_ION_PERF= )
-if test -n "$JS_ION_PERF"; then
-    AC_DEFINE(JS_ION_PERF)
-fi
-
-dnl ========================================================
 dnl Enable changes that make the shell more deterministic
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(more-deterministic,
 [  --enable-more-deterministic
                           Enable changes that make the shell more deterministic],
     JS_MORE_DETERMINISTIC=1,
     JS_MORE_DETERMINISTIC= )
 if test -n "$JS_MORE_DETERMINISTIC"; then