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

Fix build of compiler-rt on FreeBSD Broken since ee6011f removed cmake from the process. There are likely other platforms still broken, but I didn't test on them.
rust-lang · Jul 31, 2016 · c267ab4 · c267ab4
2 parents 1225e12 + 8604c54
commit c267ab4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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![