summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--sal/Library_sal.mk5
-rw-r--r--vcl/Library_vcl.mk5
-rw-r--r--vcl/Library_vclplug_gen.mk5
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