diff options
| author | bors <bors@rust-lang.org> | 2016-07-30 18:52:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 18:52:20 -0700 |
| commit | c267ab4e3b40dddde3804b8b80321049d9879eb9 (patch) | |
| tree | a49f5ebc6b0d72ec55be11dd5efcc64b0eb581ec | |
| parent | 1225e122fda8cfbe3a5da6007e912f204b97f8c4 (diff) | |
| parent | 8604c5494eed8d111757f23a874d9ce8ca673e2c (diff) | |
Auto merge of #35004 - asomers:master, r=alexcrichton
Fix build of compiler-rt on FreeBSD Broken since ee6011fc71e02485f2dffcc25be64631c2008775 removed cmake from the process. There are likely other platforms still broken, but I didn't test on them.
| -rw-r--r-- | mk/rt.mk | 4 | ||||
| -rw-r--r-- | src/bootstrap/native.rs | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index 067721fab4f..e86aec60893 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -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) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 05ecbc0cada..a78cef4f409 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -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![ |