---

brson · brson · commit 86681c70533a · 2012-02-12T18:23:23.000-08:00
yaml --- r: 11237 b: refs/heads/master c: 4eeb706 h: refs/heads/master i: 11235: 6345a92 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 486d07a5bcaaea5f0fda68eb681b7a34124c602f
+refs/heads/master: 4eeb706e84bc9e32aa5057e32d567ccab2c3cc2c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/mk/platform.mk b/trunk/mk/platform.mk
@@ -38,6 +38,12 @@ ifneq ($(findstring freebsd,$(CFG_OSTYPE)),)
   CFG_DEF_SUFFIX := .bsd.def
   CFG_INSTALL_NAME =
   CFG_PERF_TOOL := /usr/bin/time
+
+  # FIXME (1825): We're deadlocking on FreeBSD
+  ifndef RUST_THREADS
+    RUST_THREADS=1
+    export RUST_THREADS
+  endif
 endif
 
 ifneq ($(findstring linux,$(CFG_OSTYPE)),)
