about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-16 22:30:51 -0700
committerbors <bors@rust-lang.org>2013-09-16 22:30:51 -0700
commit66ecff2b136dccabae98d2413632ff5177313205 (patch)
treec426883f235b2f138a191051ac29161707fbc692
parentb75e07501b8a68bc2acf61d506d5b21498448c0c (diff)
parent4c49a3d8cd00489e62ab7398d05285361039ef13 (diff)
downloadrust-66ecff2b136dccabae98d2413632ff5177313205.tar.gz
rust-66ecff2b136dccabae98d2413632ff5177313205.zip
auto merge of #9237 : brson/rust/valgrind, r=thestinger
This fixes valgrind on the linux snapshot bot. The command added here
makes us require a fairly recent valgrind.
-rw-r--r--mk/platform.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/mk/platform.mk b/mk/platform.mk
index 6ee5420664d..ac6cf3c5451 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -47,8 +47,11 @@ else
   CFG_GCCISH_CFLAGS += -O2
 endif
 
+# The soname thing is for supporting a statically linked jemalloc.
+# see https://blog.mozilla.org/jseward/2012/06/05/valgrind-now-supports-jemalloc-builds-directly/
 ifdef CFG_VALGRIND
   CFG_VALGRIND += --error-exitcode=100 \
+                  --soname-synonyms=somalloc=NONE \
                   --quiet \
                   --suppressions=$(CFG_SRC_DIR)src/etc/x86.supp \
                   $(OS_SUPP)