Bug 1144842 (part 1) - Don't use MOZ_PROFILING before all the places it can be set. r=glandium.
authorNicholas Nethercote <nnethercote@mozilla.com>
Tue, 19 Jan 2016 16:03:06 -0800
changeset 281450 0517f538cdf85acc421736e65b3febab41d9706d
parent 281449 ddaa87cfd7fafd303ecfa84c324af09804676932
child 281451 16b98426457ca48e93c896bf4cc0d992b59d8832
push id29940
push usercbook@mozilla.com
push dateMon, 25 Jan 2016 10:50:21 +0000
treeherdermozilla-central@67c66c2878ae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1144842
milestone46.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 1144842 (part 1) - Don't use MOZ_PROFILING before all the places it can be set. r=glandium.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -1687,25 +1687,16 @@ dnl ====================================
 MOZ_ARG_ENABLE_BOOL(systrace,
 [  --enable-systrace       Set compile flags necessary for using sampling profilers (e.g. shark, perf)],
     MOZ_USE_SYSTRACE=1,
     MOZ_USE_SYSTRACE= )
 if test -n "$MOZ_USE_SYSTRACE"; then
     AC_DEFINE(MOZ_USE_SYSTRACE)
 fi
 
-# For profiling builds keep the symbol information
-if test "$MOZ_PROFILING" -a -z "$STRIP_FLAGS"; then
-    case "$OS_TARGET" in
-    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
-        STRIP_FLAGS="--strip-debug"
-        ;;
-    esac
-fi
-
 dnl ========================================================
 dnl = Use Valgrind
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(valgrind,
 [  --enable-valgrind       Enable Valgrind integration hooks (default=no)],
     MOZ_VALGRIND=1,
     MOZ_VALGRIND= )
 if test -n "$MOZ_VALGRIND"; then
@@ -1794,16 +1785,25 @@ MOZ_ARG_ENABLE_BOOL(vtune,
 [  --enable-vtune          Enable vtune profiling. Implies --enable-profiling.],
     MOZ_VTUNE=1,
     MOZ_VTUNE= )
 if test -n "$MOZ_VTUNE"; then
     MOZ_PROFILING=1
     AC_DEFINE(MOZ_VTUNE)
 fi
 
+# For profiling builds keep the symbol information
+if test "$MOZ_PROFILING" -a -z "$STRIP_FLAGS"; then
+    case "$OS_TARGET" in
+    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
+        STRIP_FLAGS="--strip-debug"
+        ;;
+    esac
+fi
+
 dnl ========================================================
 dnl Profiling
 dnl ========================================================
 if test -n "$MOZ_PROFILING"; then
     AC_DEFINE(MOZ_PROFILING)
 fi
 
 dnl ========================================================