Skip to content

fix compiletest deadlock on freebsd #2523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2012
Merged

fix compiletest deadlock on freebsd #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions mk/platform.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),)
Expand Down
13 changes: 7 additions & 6 deletions src/rustc/back/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down