summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Didron <fdidron@users.noreply.github.com>2019-04-26 11:16:03 +0900
committerGitHub <noreply@github.com>2019-04-26 11:16:03 +0900
commitc941ef0f0993a3fcb63e6d42e926bb8bd1f1a81f (patch)
treefc41c253c592c8018d36584ee3d7a9e93e112f64
parent1a3d6cd98f9ce5992846d11fa0937bcd4a8376dc (diff)
parenteedffbdfc46b57a547f4adeb1de8c47da35a7516 (diff)
Merge pull request #27 from zsa/src_fix
Src fix
-rw-r--r--changelog.md1
-rw-r--r--tmk_core/arm_atsam.mk2
-rw-r--r--tmk_core/avr.mk2
-rw-r--r--tmk_core/rules.mk2
4 files changed, 4 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md
index 32a9c1c025..ea84fedc2b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,4 +11,5 @@
04-22-2019 - Add new reactive modes (wide, cross, nexus) for RGB Matrix
04-22-2019 - OLED Driver Features
04-22-2019 - Add Split RGB support
+04-24-2019 - fix LIB_SRC and QUANTUM_LIB_SRC for ARM
04-24-2019 - Add RGB Split fixes and RGB Names
diff --git a/tmk_core/arm_atsam.mk b/tmk_core/arm_atsam.mk
index 06823fb629..25a3411f4f 100644
--- a/tmk_core/arm_atsam.mk
+++ b/tmk_core/arm_atsam.mk
@@ -6,7 +6,7 @@ CC = arm-none-eabi-gcc
OBJCOPY = arm-none-eabi-objcopy
OBJDUMP = arm-none-eabi-objdump
SIZE = arm-none-eabi-size
-AR = arm-none-eabi-ar rcs
+AR = arm-none-eabi-ar
NM = arm-none-eabi-nm
HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index f6af3f5e29..6bf86d58a8 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -6,7 +6,7 @@ CC = avr-gcc
OBJCOPY = avr-objcopy
OBJDUMP = avr-objdump
SIZE = avr-size
-AR = avr-ar rcs
+AR = avr-ar
NM = avr-nm
HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 3a322cee4f..6d2bb51f07 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -331,7 +331,7 @@ $1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN)
$1/%.a : $1/%.o
@mkdir -p $$(@D)
@$(SILENT) || printf "Archiving: $$<" | $$(AWK_CMD)
- $$(eval CMD=$$(AR) $$@ $$<)
+ $$(eval CMD=$$(AR) rcs $$@ $$<)
@$$(BUILD_CMD)
$1/force: