Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d8c16df

Browse files
committedJun 7, 2012
Merge pull request #2523 from crabtw/freebsd
fix compiletest deadlock on freebsd
2 parents 3cbd1e2 + 8f5f45b commit d8c16df

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed
 

‎mk/platform.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ ifneq ($(findstring freebsd,$(CFG_OSTYPE)),)
3333
CFG_DEF_SUFFIX := .bsd.def
3434
CFG_INSTALL_NAME =
3535
CFG_PERF_TOOL := /usr/bin/time
36-
37-
# FIXME (1825): We're deadlocking on FreeBSD
38-
ifndef RUST_THREADS
39-
RUST_THREADS=1
40-
export RUST_THREADS
41-
endif
4236
endif
4337

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

‎src/rustc/back/link.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -645,12 +645,13 @@ fn link_binary(sess: session,
645645
}
646646

647647
if sess.targ_cfg.os == session::os_freebsd {
648-
cc_args += ["-lrt", "-L/usr/local/lib", "-lexecinfo",
649-
"-L/usr/local/lib/gcc46",
650-
"-L/usr/local/lib/gcc44", "-lstdc++",
651-
"-Wl,-z,origin",
652-
"-Wl,-rpath,/usr/local/lib/gcc46",
653-
"-Wl,-rpath,/usr/local/lib/gcc44"];
648+
cc_args += ["-pthread", "-lrt",
649+
"-L/usr/local/lib", "-lexecinfo",
650+
"-L/usr/local/lib/gcc46",
651+
"-L/usr/local/lib/gcc44", "-lstdc++",
652+
"-Wl,-z,origin",
653+
"-Wl,-rpath,/usr/local/lib/gcc46",
654+
"-Wl,-rpath,/usr/local/lib/gcc44"];
654655
}
655656

656657
// OS X 10.6 introduced 'compact unwind info', which is produced by the

0 commit comments

Comments
 (0)
Please sign in to comment.