aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudar <sudar@sudarmuthu.com>2014-02-06 10:21:35 +0530
committerSudar <sudar@sudarmuthu.com>2014-02-06 10:21:35 +0530
commit0b954ab5a566c148badde04bd6652d2dfac07f33 (patch)
treece241cca470236e053070ffa87b3fcdb727a8819
parent5d5704ff97cf05a818eae5c07e889db9e6eb36b0 (diff)
parent920c74024e1ec249f73f9cc38624cf2cc9bd85e1 (diff)
Merge pull request #164 from sej7278/master
Include avr-libc/*.c files malloc.c and realloc.c
-rw-r--r--Arduino.mk3
-rw-r--r--HISTORY.md1
2 files changed, 3 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 0aa4701..7c06094 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -19,7 +19,7 @@
#
# Original Arduino adaptation by mellis, eighthave, oli.keller
#
-# Current version: 1.3.1
+# Current version: 1.3.2
#
# Refer to HISTORY.md file for complete history of changes
#
@@ -629,6 +629,7 @@ endif
ifeq ($(strip $(NO_CORE)),)
ifdef ARDUINO_CORE_PATH
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)
ifneq ($(strip $(NO_CORE_MAIN_CPP)),)
diff --git a/HISTORY.md b/HISTORY.md
index e4c4392..7d0eaa2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -6,6 +6,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
### 1.3.2 (in development)
- Fix: Add arduino-mk-vars.md file to RPM SPECfile. (https://github.com/sej7278)
+- Fix: Add avr-libc/malloc.c and realloc.c to included core files. Fixes issue #163 (https://github.com/sej7278)
### 1.3.1 (2014-02-04)
- Fix: BUNDLED_AVR_TOOLS_DIR is now set properly when using only arduino-core and not the whole arduino package. (https://github.com/sej7278)