From b0e1b2629296927e4f4c870a04864634147930fe Mon Sep 17 00:00:00 2001 From: Phillip Pearson Date: Sat, 28 Apr 2018 22:57:00 -0700 Subject: [PATCH] Change := to += to allow projects to add their own objs to OTHER_OBJS OTHER_OBJS is an undocumented, but useful, way to add extra sources to a project. Setting it with := here breaks this functionality, so I've changed it to += to not trample on the user-set value. --- Arduino.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Arduino.mk b/Arduino.mk index 8ef79c7..b7b4516 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -844,7 +844,7 @@ ifeq ($(strip $(NO_CORE)),) # Put alt core variant file for M0 devices in OTHER_OJBS ifdef ALT_CORE_CPP_SRCS ALT_CORE_OBJ_FILES = $(ALT_CORE_C_SRCS:.c=.c.o) $(ALT_CORE_CPP_SRCS:.cpp=.cpp.o) $(ALT_CORE_AS_SRCS:.S=.S.o) - OTHER_OBJS := $(patsubst $(ALTERNATE_CORE_PATH)/variants/$(VARIANT)/%, \ + OTHER_OBJS += $(patsubst $(ALTERNATE_CORE_PATH)/variants/$(VARIANT)/%, \ $(OBJDIR)/core/%,$(ALT_CORE_OBJ_FILES)) endif