From 5163606d060ccb2c6462d34f590e2a1f30ce4a1f Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 3 Feb 2012 12:22:53 -0800
Subject: [PATCH] platform-specific valgrind suppression

---
 mk/platform.mk            | 8 +++++++-
 src/etc/apple-darwin.supp | 9 +++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 src/etc/apple-darwin.supp

diff --git a/mk/platform.mk b/mk/platform.mk
index 10cef47e6f0..45c1d3ab751 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -99,6 +99,10 @@ ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
   CFG_INSTALL_NAME = -Wl,-install_name,@rpath/$(1)
 endif
 
+# Hack: not sure how to test if a file exists in make other than this
+OS_SUPP = $(patsubst %,--suppressions=%,\
+	    $(wildcard $(CFG_SRC_DIR)src/etc/$(CFG_OSTYPE).supp*))
+
 ifneq ($(findstring mingw,$(CFG_OSTYPE)),)
   CFG_WINDOWSY := 1
 endif
@@ -154,7 +158,9 @@ ifdef CFG_UNIXY
   ifdef CFG_VALGRIND
     CFG_VALGRIND += --leak-check=full \
                     --error-exitcode=100 \
-                    --quiet --suppressions=$(CFG_SRC_DIR)src/etc/x86.supp
+                    --quiet \
+                    --suppressions=$(CFG_SRC_DIR)src/etc/x86.supp \
+                    $(OS_SUPP)
   endif
 endif
 
diff --git a/src/etc/apple-darwin.supp b/src/etc/apple-darwin.supp
new file mode 100644
index 00000000000..7e2598f7694
--- /dev/null
+++ b/src/etc/apple-darwin.supp
@@ -0,0 +1,9 @@
+{
+   issue_1333_setenv_leak
+   Memcheck:Leak
+   fun:malloc_zone_malloc
+   ...
+   fun:setenv
+   fun:setenv__c_stack_shim
+   ...
+}