Skip to content

Commit 4d51533

Browse files
committed
---
yaml --- r: 14243 b: refs/heads/try c: 4eeb706 h: refs/heads/master i: 14241: 4c8496c 14239: c87d1d9 v: v3
1 parent eb541c3 commit 4d51533

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 486d07a5bcaaea5f0fda68eb681b7a34124c602f
5+
refs/heads/try: 4eeb706e84bc9e32aa5057e32d567ccab2c3cc2c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/mk/platform.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ ifneq ($(findstring freebsd,$(CFG_OSTYPE)),)
3838
CFG_DEF_SUFFIX := .bsd.def
3939
CFG_INSTALL_NAME =
4040
CFG_PERF_TOOL := /usr/bin/time
41+
42+
# FIXME (1825): We're deadlocking on FreeBSD
43+
ifndef RUST_THREADS
44+
RUST_THREADS=1
45+
export RUST_THREADS
46+
endif
4147
endif
4248

4349
ifneq ($(findstring linux,$(CFG_OSTYPE)),)

0 commit comments

Comments
 (0)