diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-09 19:29:05 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-09 19:29:47 +0100 |
| commit | 89f80c167112837346ec5a63873f620a07a76493 (patch) | |
| tree | 7f6490039edfbe6305d72ef88a6863b046989aa2 | |
| parent | 7b213e05a4f6aecd8b5388fb8fa8cec355302b07 (diff) | |
configure: why not set up VALGRIND_CFLAGS all in one place
Also unbreaks the build because VALGRIND_CFLAGS is now never
empty with cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891.
Change-Id: Ide5ca799b3656ccaff483ca05dbc18682136345f
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | sal/Library_sal.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 5 |
4 files changed, 4 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c968dc2e19ef..77a6011b7e5d 100644 --- a/configure.ac +++ b/configure.ac @@ -5058,6 +5058,7 @@ if test "$cross_compiling" != "yes" -a -n "$ENABLE_DBGUTIL" -a \ AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""]) fi CPPFLAGS=$prev_cppflags + VALGRIND_CFLAGS="${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1" fi AC_SUBST([VALGRIND_CFLAGS]) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 73335befab10..854e95fdb6b2 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,sal,\ )) $(eval $(call gb_Library_add_defs,sal,\ - $(if $(VALGRIND_CFLAGS), \ - $(VALGRIND_CFLAGS) \ - -DHAVE_MEMCHECK_H=1 \ - ) \ + $(VALGRIND_CFLAGS) \ $(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \ -DFORCE_SYSALLOC \ ) \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 469aa5e65b03..6b1545a60403 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -471,10 +471,7 @@ vcl_headless_code=\ vcl/headless/svpvd $(eval $(call gb_Library_add_defs,vcl,\ - $(if $(VALGRIND_CFLAGS), \ - $(VALGRIND_CFLAGS) \ - -DHAVE_MEMCHECK_H=1 \ - ) \ + $(VALGRIND_CFLAGS) \ )) ifeq ($(GUIBASE),unx) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 0f709fd1cc61..38b866c08fb6 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -123,10 +123,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ endif $(eval $(call gb_Library_add_defs,vclplug_gen,\ - $(if $(VALGRIND_CFLAGS), \ - $(VALGRIND_CFLAGS) \ - -DHAVE_MEMCHECK_H=1 \ - ) \ + $(VALGRIND_CFLAGS) \ )) ## handle Xinerama |