From d10a509932a78dc0e3d635aa554bf084befe99f4 Mon Sep 17 00:00:00 2001 From: "Jonathan A. Kollasch" Date: Mon, 23 Jan 2017 10:14:16 -0600 Subject: [PATCH] Don't build gcc_personality_v0.c on NetBSD either --- mk/rt.mk | 2 ++ src/libcompiler_builtins/build.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mk/rt.mk b/mk/rt.mk index a67bded288e20..f5149281d5071 100644 --- 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 index b9421d779b590..5360bbdeacd6a 100644 --- 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"]); }