Bug 672046 - Valgrind suppression files are still generated in objdir even when building without --enable-valgrind; r=ted
authorEd Morley <bmo@edmorley.co.uk>
Sat, 23 Jul 2011 11:59:19 +0200
changeset 73233 452be6a8b6e454956d60a580719ce8f5eae6521d
parent 73232 2d7532f8196157a0cfe5c766c21098cf8c7522a1
child 73234 f8c8d93dc9c5202ec4ba2f9245c1a681d8546c77
push id20833
push userMs2ger@gmail.com
push dateSat, 23 Jul 2011 10:00:37 +0000
treeherdermozilla-central@452be6a8b6e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs672046
milestone8.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 672046 - Valgrind suppression files are still generated in objdir even when building without --enable-valgrind; r=ted
build/Makefile.in
configure.in
js/src/configure.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -97,26 +97,28 @@ GARBAGE_DIRS += $(_LEAKTEST_DIR)
 leaktest.py: leaktest.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $^ > $@
 	chmod +x $@
 GARBAGE += leaktest.py
 
 libs:: $(_LEAKTEST_FILES)
 	$(INSTALL) $^ $(_LEAKTEST_DIR)
 
+ifdef MOZ_VALGRIND
 _VALGRIND_DIR = $(DEPTH)/_valgrind
 GARBAGE_DIRS += $(_VALGRIND_DIR)
 
 _VALGRIND_FILES = \
 		$(topsrcdir)/build/valgrind/i686-redhat-linux-gnu.sup \
 		$(topsrcdir)/build/valgrind/x86_64-redhat-linux-gnu.sup \
 		$(NULL)
 
 libs:: $(_VALGRIND_FILES)
 	$(INSTALL) $^ $(_VALGRIND_DIR)
+endif
 
 ifdef ENABLE_TESTS
 libs:: $(topsrcdir)/tools/rb/fix_stack_using_bpsyms.py
 	$(INSTALL) $< $(DIST)/bin
 
 # Unit tests for ManifestParser
 check::
 	$(PYTHON) $(topsrcdir)/config/pythonpath.py -I$(srcdir) \
--- a/configure.in
+++ b/configure.in
@@ -1822,17 +1822,19 @@ MOZ_ARG_ENABLE_BOOL(valgrind,
 [  --enable-valgrind       Enable Valgrind integration hooks (default=no)],
     MOZ_VALGRIND=1,
     MOZ_VALGRIND= )
 if test -n "$MOZ_VALGRIND"; then
     MOZ_CHECK_HEADER([valgrind/valgrind.h], [],
         AC_MSG_ERROR(
             [--enable-valgrind specified but Valgrind is not installed]))
     AC_DEFINE(MOZ_VALGRIND)
-fi
+    MOZ_VALGRIND=1
+fi
+AC_SUBST(MOZ_VALGRIND)
 
 dnl ========================================================
 dnl jprof
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(jprof,
 [  --enable-jprof          Enable jprof profiling tool (needs mozilla/tools/jprof). Implies --enable-profiling.],
     MOZ_JPROF=1,
     MOZ_JPROF= )
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4986,17 +4986,19 @@ MOZ_ARG_ENABLE_BOOL(valgrind,
 [  --enable-valgrind       Enable Valgrind integration hooks (default=no)],
     MOZ_VALGRIND=1,
     MOZ_VALGRIND= )
 if test -n "$MOZ_VALGRIND"; then
     AC_CHECK_HEADER([valgrind/valgrind.h], [],
         AC_MSG_ERROR(
             [--enable-valgrind specified but Valgrind is not installed]))
     AC_DEFINE(MOZ_VALGRIND)
+    MOZ_VALGRIND=1
 fi
+AC_SUBST(MOZ_VALGRIND)
 
 dnl ========================================================
 dnl jprof
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(jprof,
 [  --enable-jprof          Enable jprof profiling tool (needs mozilla/tools/jprof). Implies --enable-profiling.],
     MOZ_JPROF=1,
     MOZ_JPROF= )