Rollup merge of rust-lang#23255 - dhuseby:master, r=alexcrichton

Manishearth · Manishearth · commit e4010d1bf645 · 2015-03-12T09:14:16.000+05:30
it turns out that jemalloc doesn't behave well on bitrig.  with jemalloc enabled i get some kernel errors related to sbrk failures.  with jemalloc disabled, the errors go away.  i am investigating, but in the mean time, we should just disable jemalloc by default on bitrig.
diff --git a/configure b/configure
@@ -760,8 +760,9 @@ fi
 # Force bitrig to build with clang; gcc doesn't like us there
 if [ $CFG_OSTYPE = unknown-bitrig ]
 then
-    step_msg "on Bitrig, forcing use of clang"
+    step_msg "on Bitrig, forcing use of clang, disabling jemalloc"
     CFG_ENABLE_CLANG=1
+    CFG_ENABLE_JEMALLOC=0
 fi
 
 if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,4 +1,5 @@
 S 2015-03-07 270a677
+  bitrig-x86_64 4b2f11a96b1b5b3782d74bda707aca33bc179880
   freebsd-x86_64 3c147d8e4cfdcb02c2569f5aca689a1d8920d17b
   linux-i386 50a47ef247610fb089d2c4f24e4b641eb0ba4afb
   linux-x86_64 ccb20709b3c984f960ddde996451be8ce2268d7c

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`S 2015-03-07 270a677`
	`2`	`+ bitrig-x86_64 4b2f11a96b1b5b3782d74bda707aca33bc179880`
`2`	`3`	`freebsd-x86_64 3c147d8e4cfdcb02c2569f5aca689a1d8920d17b`
`3`	`4`	`linux-i386 50a47ef247610fb089d2c4f24e4b641eb0ba4afb`
`4`	`5`	`linux-x86_64 ccb20709b3c984f960ddde996451be8ce2268d7c`