---

yaml
---
r: 13336
b: refs/heads/master
c: 67e62b3
h: refs/heads/master
v: v3

Author: z0w0

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8f5f45bfe143b667a4d3bb41963ed130b13fdb7f
+refs/heads/master: 67e62b388c7cd26bb76cf3ea467514951f648495
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/Makefile.in

@@ -421,9 +421,9 @@ else
 TSREQS :=											\
 	$(foreach target,$(CFG_TARGET_TRIPLES),			\
 		$(SREQ3_T_$(target)_H_$(CFG_HOST_TRIPLE)))
-FUZZ := $(HBIN2_H_$(CFG_HOST_TRIPLE))/fuzzer$(X)
-CARGO := $(HBIN2_H_$(CFG_HOST_TRIPLE))/cargo$(X)
-RUSTDOC := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
+FUZZ := $(HBIN3_H_$(CFG_HOST_TRIPLE))/fuzzer$(X)
+CARGO := $(HBIN3_H_$(CFG_HOST_TRIPLE))/cargo$(X)
+RUSTDOC := $(HBIN3_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
 
 all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC)
 

trunk/mk/platform.mk

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