aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2015-07-09 22:26:02 +0200
committerSimon John <git@the-jedi.co.uk>2015-07-09 22:26:02 +0200
commit28210c85a92d3f38efc98581621735605dec1ad1 (patch)
treef09b9c63104f73d6fb21b7499372d1d3726d663e /Arduino.mk
parentda5f42be21263a5f87d0ab4a7f13fc1ca2a007eb (diff)
Took another couple of changes from @peplin's PR #256 for chipKIT
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 7f1060b..9c0d252 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1407,7 +1407,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
+ $(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) -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)