This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 1076cb933dce83ab9c9f4c446b26b07e6340ba55 Author: bijunda <[email protected]> AuthorDate: Wed May 13 15:39:31 2026 +0800 fix(compiler-rt): avoid duplicate builtins dir on sim compiler-rt/Make.defs:45: target `bin/compiler-rt/compiler-rt/lib/builtins' given more than once in the same rule. compiler-rt/Make.defs:45: target `kbin/compiler-rt/compiler-rt/lib/builtins' given more than once in the same rule. Signed-off-by: bijunda <[email protected]> --- libs/libbuiltin/compiler-rt/Make.defs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/libbuiltin/compiler-rt/Make.defs b/libs/libbuiltin/compiler-rt/Make.defs index 3530d0b8f96..d5b66a294b2 100644 --- a/libs/libbuiltin/compiler-rt/Make.defs +++ b/libs/libbuiltin/compiler-rt/Make.defs @@ -36,9 +36,12 @@ COMPILER_RT_OBJDIR = compiler-rt \ compiler-rt/compiler-rt \ compiler-rt/compiler-rt/lib \ compiler-rt/compiler-rt/lib/builtins \ - compiler-rt/compiler-rt/lib/builtins/$(ARCH) \ compiler-rt/compiler-rt/lib/profile +ifneq ($(ARCH),) +COMPILER_RT_OBJDIR += compiler-rt/compiler-rt/lib/builtins/$(ARCH) +endif + BIN_OBJDIR = $(addprefix $(BINDIR)$(DELIM),$(COMPILER_RT_OBJDIR)) KBIN_OBJDIR = $(addprefix $(KBINDIR)$(DELIM),$(COMPILER_RT_OBJDIR)) @@ -80,13 +83,16 @@ endif ifeq ($(CONFIG_BUILTIN_COMPILER_RT),y) FLAGS += ${INCDIR_PREFIX}$(CURDIR)/compiler-rt/compiler-rt/lib/builtins -FLAGS += ${INCDIR_PREFIX}$(CURDIR)/compiler-rt/compiler-rt/lib/builtins/${ARCH} FLAGS += -Wno-undef -Wno-macro-redefined CSRCS += $(wildcard compiler-rt/compiler-rt/lib/builtins/*.c) + +ifneq ($(ARCH),) +FLAGS += ${INCDIR_PREFIX}$(CURDIR)/compiler-rt/compiler-rt/lib/builtins/${ARCH} ASRCS += $(wildcard compiler-rt/compiler-rt/lib/builtins/$(ARCH)/*.S) CSRCS += $(wildcard compiler-rt/compiler-rt/lib/builtins/$(ARCH)/*.c) +endif ifeq ($(CONFIG_LIB_COMPILER_RT_HAS_BFLOAT16),) BFLOAT16_SRCS := compiler-rt/compiler-rt/lib/builtins/truncdfbf2.c
