---

pcwalton · pcwalton · commit c78bf6e0bdfe · 2011-05-05T18:11:40.000-07:00
yaml --- r: 2399 b: refs/heads/master c: 518e2d2 h: refs/heads/master i: 2397: 2c83316 2395: df96687 2391: d1c0356 2383: 2a470f2 2367: b52abdd v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 883eb38b283d9f2486529ec1bf1e7f695396d96f
+refs/heads/master: 518e2d249c062211c2c1211327f2e21451920047
diff --git a/trunk/Makefile.in b/trunk/Makefile.in
@@ -46,6 +46,10 @@ ifdef CFG_DISABLE_VALGRIND
   $(info cfg: disabling valgrind (CFG_DISABLE_VALGRIND))
   CFG_VALGRIND :=
 endif
+ifdef CFG_BAD_VALGRIND
+  $(info cfg: disabling valgrind due to its unreliability on this platform)
+  CFG_VALGRIND :=
+endif
 
 DOCS :=
 ifeq ($(CFG_MAKEINFO),)
diff --git a/trunk/configure b/trunk/configure
@@ -201,6 +201,15 @@ probe CFG_MAKEINFO         makeinfo
 probe CFG_TEXI2PDF         texi2pdf
 probe CFG_TEX              tex
 
+# Valgrind is only reliable on Linux. On Windows it doesn't work at all, and
+# on the Mac the dynamic linker causes Valgrind to emit a huge stream of
+# errors.
+if [ $CFG_OSTYPE != Linux ]
+then
+    CFG_BAD_VALGRIND=1
+    putvar CFG_BAD_VALGRIND
+fi
+
 if [ ! -z "$CFG_LLVM_ROOT" ]
 then
     CFG_LLVM_INCDIR="$CFG_LLVM_ROOT/include"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 883eb38b283d9f2486529ec1bf1e7f695396d96f`
	`2`	`+refs/heads/master: 518e2d249c062211c2c1211327f2e21451920047`