---

yaml
---
r: 16344
b: refs/heads/try
c: d8c16df
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 3cbd1e221ec9625e7879adb3fe406efd082cb60d
+refs/heads/try: d8c16df153a236edf047fe60bf76b98e95611655
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/mk/platform.mk

@@ -33,12 +33,6 @@ 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)),)

branches/try/src/rustc/back/link.rs

@@ -645,12 +645,13 @@ fn link_binary(sess: session,
     }
 
     if sess.targ_cfg.os == session::os_freebsd {
-        cc_args += ["-lrt", "-L/usr/local/lib", "-lexecinfo",
-                     "-L/usr/local/lib/gcc46",
-                     "-L/usr/local/lib/gcc44", "-lstdc++",
-                     "-Wl,-z,origin",
-                     "-Wl,-rpath,/usr/local/lib/gcc46",
-                     "-Wl,-rpath,/usr/local/lib/gcc44"];
+        cc_args += ["-pthread", "-lrt",
+                    "-L/usr/local/lib", "-lexecinfo",
+                    "-L/usr/local/lib/gcc46",
+                    "-L/usr/local/lib/gcc44", "-lstdc++",
+                    "-Wl,-z,origin",
+                    "-Wl,-rpath,/usr/local/lib/gcc46",
+                    "-Wl,-rpath,/usr/local/lib/gcc44"];
     }
 
     // OS X 10.6 introduced 'compact unwind info', which is produced by the