dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change := to += to allow projects to add their own objs to OTHER_OBJS

Browse source 
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.
This commit is contained in:
Phillip Pearson 2018-04-28 22:57:00 -07:00
parent 0809b54606
commit b0e1b26292
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino.mk
View file

@ -844,7 +844,7 @@ ifeq ($(strip $(NO_CORE)),)
# Put alt core variant file for M0 devices in OTHER_OJBS # Put alt core variant file for M0 devices in OTHER_OJBS
ifdef ALT_CORE_CPP_SRCS 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) 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)) $(OBJDIR)/core/%,$(ALT_CORE_OBJ_FILES))
endif endif