diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2014-05-11 19:31:23 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2014-05-11 20:05:22 -0400 |
| commit | f1735cefcfdee5260ea6961cf785f545a340ff85 (patch) | |
| tree | e298ac285466e1111fba1e5c76bec27dbd2e783c | |
| parent | 69b321c84bea60b2ac727c4acbd9a34b19182209 (diff) | |
| download | rust-f1735cefcfdee5260ea6961cf785f545a340ff85.tar.gz rust-f1735cefcfdee5260ea6961cf785f545a340ff85.zip | |
make sure jemalloc valgrind support is enabled
This requires pointing it at the valgrind headers we carry in-tree.
| -rw-r--r-- | .gitattributes | 2 | ||||
| -rw-r--r-- | mk/rt.mk | 1 | ||||
| -rw-r--r-- | mk/tests.mk | 4 | ||||
| -rw-r--r-- | src/rt/rust_builtin.c | 2 | ||||
| -rw-r--r-- | src/rt/valgrind/memcheck.h (renamed from src/rt/vg/memcheck.h) | 0 | ||||
| -rw-r--r-- | src/rt/valgrind/valgrind.h (renamed from src/rt/vg/valgrind.h) | 0 |
6 files changed, 5 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index d65c979a074..c15f7aba7c9 100644 --- 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 index b18b13c25c0..67ca5fefffc 100644 --- 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 index 71d56d11a73..9ce7077e03c 100644 --- 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 index 9c27fe1c5e4..6ab36f1db7a 100644 --- 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 b/src/rt/valgrind/memcheck.h index 68474b44186..68474b44186 100644 --- a/src/rt/vg/memcheck.h +++ b/src/rt/valgrind/memcheck.h diff --git a/src/rt/vg/valgrind.h b/src/rt/valgrind/valgrind.h index c9aa0fd0328..c9aa0fd0328 100644 --- a/src/rt/vg/valgrind.h +++ b/src/rt/valgrind/valgrind.h |