user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2523 from crabtw/freebsd

Browse source 
fix compiletest deadlock on freebsd
This commit is contained in:
Tim Chevalier 2012-06-07 09:25:34 -07:00
commit d8c16df153
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mk/platform.mk
View file

@ -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)),)

13
src/rustc/back/link.rs
View file

@ -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