Bug 1421792 - move --enable-trace-logging to moz.configure; r=nalexander
☠☠ backed out by ed8eade7d0d1 ☠ ☠
authorNathan Froyd <froydnj@mozilla.com>
Fri, 01 Dec 2017 21:29:27 -0500
changeset 448862 f9231cda92d8fee90ffee34513b433a07b7b8d18
parent 448861 08fb3c18e98dabddbc9d982e5ee47ee128f71a3c
child 448863 ed8eade7d0d1bf5f8648383e861da77f776c37f2
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1421792
milestone59.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 1421792 - move --enable-trace-logging 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
@@ -223,17 +223,16 @@ def old_configure_options(*options):
     '--enable-strip',
     '--enable-synth-pico',
     '--enable-system-cairo',
     '--enable-system-extension-dirs',
     '--enable-system-pixman',
     '--enable-system-sqlite',
     '--enable-tasktracer',
     '--enable-thread-sanitizer',
-    '--enable-trace-logging',
     '--enable-ubsan-int-overflow',
     '--enable-ui-locale',
     '--enable-universalchardet',
     '--enable-updater',
     '--enable-valgrind',
     '--enable-verify-mar',
     '--enable-xul',
     '--enable-zipwriter',
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -269,16 +269,28 @@ js_option('--enable-gc-trace', env='JS_G
 @depends('--enable-gc-trace')
 def gc_trace(value):
     if value:
         return True
 
 set_define('JS_GC_TRACE', gc_trace)
 
 
+# Trace logging.
+# =======================================================
+js_option('--enable-trace-logging',
+          default=depends_if(moz_debug)(lambda x: True),
+          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))
+
+
 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
@@ -1467,34 +1467,16 @@ fi
 fi # COMPILE_ENVIRONMENT
 
 AC_SUBST_LIST(MOZ_FRAMEPTR_FLAGS)
 AC_SUBST_LIST(MOZ_OPTIMIZE_FLAGS)
 AC_SUBST_LIST(MOZ_OPTIMIZE_LDFLAGS)
 AC_SUBST_LIST(MOZ_PGO_OPTIMIZE_FLAGS)
 
 dnl ========================================================
-dnl = Trace logging. Enabled by default in DEBUG builds.
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(trace-logging,
-[  --enable-trace-logging   Enable trace logging],
-    ENABLE_TRACE_LOGGING=1,
-    ENABLE_TRACE_LOGGING= )
-
-if test -n "$MOZ_DEBUG"; then
-    ENABLE_TRACE_LOGGING=1
-fi
-
-AC_SUBST(ENABLE_TRACE_LOGGING)
-
-if test -n "$ENABLE_TRACE_LOGGING"; then
-    AC_DEFINE(JS_TRACE_LOGGING)
-fi
-
-dnl ========================================================
 dnl = Disable treating compiler warnings as errors
 dnl ========================================================
 if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then
    WARNINGS_AS_ERRORS=''
 fi
 
 dnl ========================================================
 dnl = Enable jemalloc