Auto merge of rust-lang#39425 - jakllsch:netbsd-a, r=alexcrichton

Don't build gcc_personality_v0.c on NetBSD either
frewsxcv · Feb 4, 2017 · 7df5c0f · 7df5c0f
2 parents 1b5c7ac + d10a509
commit 7df5c0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/mk/rt.mk b/mk/rt.mk
@@ -552,9 +552,11 @@ endif
 ifeq ($$(findstring msvc,$(1)),)
 
 ifeq ($$(findstring freebsd,$(1)),)
+ifeq ($$(findstring netbsd,$(1)),)
 $(call ADD_INTRINSIC,$(1),gcc_personality_v0.o)
 endif
 endif
+endif
 
 ifeq ($$(findstring aarch64,$(1)),aarch64)
 $(foreach intrinsic,comparetf2.o \

diff --git a/src/libcompiler_builtins/build.rs b/src/libcompiler_builtins/build.rs
@@ -240,7 +240,7 @@ fn main() {
             sources.extend(&["x86_64/floatdidf.c", "x86_64/floatdisf.c", "x86_64/floatdixf.c"]);
         }
     } else {
-        if !target.contains("freebsd") {
+        if !target.contains("freebsd") && !target.contains("netbsd") {
             sources.extend(&["gcc_personality_v0.c"]);
         }