bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #35004 - asomers:master, r=alexcrichton

Browse source 
Fix build of compiler-rt on FreeBSD

Broken since ee6011fc71 removed cmake from the
process.  There are likely other platforms still broken, but I didn't test on them.
This commit is contained in:
bors 2016-07-30 18:52:20 -07:00 • committed by GitHub
commit c267ab4e3b
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mk/rt.mk
View file

@ -384,7 +384,11 @@ COMPRT_OBJS_$(1) += emutls.o
endif
ifeq ($$(findstring msvc,$(1)),)
ifeq ($$(findstring freebsd,$(1)),)
COMPRT_OBJS_$(1) += gcc_personality_v0.o
endif
COMPRT_OBJS_$(1) += emutls.o
ifeq ($$(findstring x86_64,$(1)),x86_64)

4
src/bootstrap/native.rs
View file

@ -348,7 +348,9 @@ pub fn compiler_rt(build: &Build, target: &str) {
]);
}
} else {
sources.push("gcc_personality_v0.c");
if !target.contains("freebsd") {
sources.push("gcc_personality_v0.c");
}
if target.contains("x86_64") {
sources.extend(vec![