diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2016-11-09 07:27:07 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 07:27:07 +0530 |
| commit | 2c1155e156ac0cbfb5c02033efb841597c5004f0 (patch) | |
| tree | 348c40c56a84c6559b5f8e03ab498ca9b30a063a /Arduino.mk | |
| parent | 23556d759cfaf94b7ed4a996f177412833e55387 (diff) | |
| parent | 7d564b6a26ffaaf270b80fa10deb9d4d732c1aae (diff) | |
Merge pull request #468 from georgeharker/master
Update to work with Arduino 1.6.12 and Teensyduino 1.30
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1293,7 +1293,7 @@ endif $(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(COMMON_DEPS) @$(MKDIR) $(dir $@) -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom='alloc,load' \ - --change-section-lma .eeprom=0 -O ihex $< $@ + --no-change-warnings --change-section-lma .eeprom=0 -O ihex $< $@ $(OBJDIR)/%.lss: $(OBJDIR)/%.elf $(COMMON_DEPS) @$(MKDIR) $(dir $@) @@ -1439,7 +1439,7 @@ pre-build: $(call runscript_if_exists,$(PRE_BUILD_HOOK)) $(TARGET_ELF): $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) - $(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) -lc -lm $(LINKER_SCRIPTS) + $(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) $(OTHER_LIBS) -lc -lm $(LINKER_SCRIPTS) $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(PLATFORM_LIB_OBJS) $(USER_LIB_OBJS) $(AR) rcs $@ $(CORE_OBJS) $(LIB_OBJS) $(PLATFORM_LIB_OBJS) $(USER_LIB_OBJS) |