676,678c676,678
<         CORE_C_SRCS     = $(wildcard $(ARDUINO_CORE_PATH)/*.c)
<         CORE_C_SRCS    += $(wildcard $(ARDUINO_CORE_PATH)/avr-libc/*.c)
<         CORE_CPP_SRCS   = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp)
---
> 	rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
>         CORE_C_SRCS     = $(call rwildcard,$(ARDUINO_CORE_PATH),*.c)
>         CORE_CPP_SRCS   = $(call rwildcard,$(ARDUINO_CORE_PATH),*.cpp) 
1266c1266
< 		$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
---
> 		$(MONITOR_CMD) $(get_monitor_port) $(MONITOR_BAUDRATE)
