nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-14 16:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Don't build gcc_personality_v0.c on NetBSD either
This commit is contained in:
bors 2017-02-04 07:29:28 +00:00
commit 7df5c0f17b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/rt.mk
View File

@ -552,9 +552,11 @@ endif
ifeq ($$(findstring msvc,$(1)),) ifeq ($$(findstring msvc,$(1)),)
ifeq ($$(findstring freebsd,$(1)),) ifeq ($$(findstring freebsd,$(1)),)
ifeq ($$(findstring netbsd,$(1)),)
$(call ADD_INTRINSIC,$(1),gcc_personality_v0.o) $(call ADD_INTRINSIC,$(1),gcc_personality_v0.o)
endif endif
endif endif
endif
ifeq ($$(findstring aarch64,$(1)),aarch64) ifeq ($$(findstring aarch64,$(1)),aarch64)
$(foreach intrinsic,comparetf2.o \ $(foreach intrinsic,comparetf2.o \

2
src/libcompiler_builtins/build.rs
View File

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