make sure jemalloc valgrind support is enabled

This requires pointing it at the valgrind headers we carry in-tree.
mark-summerfield · May 12, 2014 · f1735ce · f1735ce
1 parent 69b321c
commit f1735ce
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,4 +7,4 @@
 src/etc/pkg/rust-logo.ico binary
 src/etc/pkg/rust-logo.png binary
 src/rt/msvc/* -whitespace
-src/rt/vg/* -whitespace
+src/rt/valgrind/* -whitespace
diff --git a/mk/rt.mk b/mk/rt.mk
@@ -260,6 +260,7 @@ $$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
 		CC="$$(CC_$(1))" \
 		AR="$$(AR_$(1))" \
 		RANLIB="$$(AR_$(1)) s" \
+		CPPFLAGS="-I $(S)src/rt/" \
 		EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1))"
 	$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
 	$$(Q)cp $$(JEMALLOC_BUILD_DIR_$(1))/lib/$$(JEMALLOC_REAL_NAME_$(1)) $$(JEMALLOC_LIB_$(1))

diff --git a/mk/tests.mk b/mk/tests.mk
@@ -227,8 +227,8 @@ ALL_HS := $(wildcard $(S)src/rt/*.h \
                      $(S)src/rt/*/*.h \
                      $(S)src/rt/*/*/*.h \
                      $(S)src/rustllvm/*.h)
-ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
-                       $(S)src/rt/vg/memcheck.h \
+ALL_HS := $(filter-out $(S)src/rt/valgrind/valgrind.h \
+                       $(S)src/rt/valgrind/memcheck.h \
                        $(S)src/rt/msvc/typeof.h \
                        $(S)src/rt/msvc/stdint.h \
                        $(S)src/rt/msvc/inttypes.h \

diff --git a/src/rt/rust_builtin.c b/src/rt/rust_builtin.c
@@ -10,7 +10,7 @@
 
 /* Foreign builtins. */
 
-#include "vg/valgrind.h"
+#include "valgrind/valgrind.h"
 
 #include <stdint.h>
 #include <time.h>

diff --git a/src/rt/vg/memcheck.h → src/rt/valgrind/memcheck.h b/src/rt/vg/memcheck.h → src/rt/valgrind/memcheck.h
diff --git a/src/rt/vg/valgrind.h → src/rt/valgrind/valgrind.h b/src/rt/vg/valgrind.h → src/rt/valgrind/valgrind.h