Skip to content

Commit c267ab4

Browse files
authored
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.
2 parents 1225e12 + 8604c54 commit c267ab4

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

mk/rt.mk

+4
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,11 @@ COMPRT_OBJS_$(1) += emutls.o
384384
endif
385385

386386
ifeq ($$(findstring msvc,$(1)),)
387+
388+
ifeq ($$(findstring freebsd,$(1)),)
387389
COMPRT_OBJS_$(1) += gcc_personality_v0.o
390+
endif
391+
388392
COMPRT_OBJS_$(1) += emutls.o
389393

390394
ifeq ($$(findstring x86_64,$(1)),x86_64)

src/bootstrap/native.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,9 @@ pub fn compiler_rt(build: &Build, target: &str) {
348348
]);
349349
}
350350
} else {
351-
sources.push("gcc_personality_v0.c");
351+
if !target.contains("freebsd") {
352+
sources.push("gcc_personality_v0.c");
353+
}
352354

353355
if target.contains("x86_64") {
354356
sources.extend(vec![

0 commit comments

Comments
 (0)