]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
fix LIB_SRC and QUANTUM_LIB_SRC for ARM (#5623)
authorTakeshi ISHII <2170248+mtei@users.noreply.github.com>
Mon, 22 Apr 2019 18:20:13 +0000 (03:20 +0900)
committerDrashna Jaelre <drashna@live.com>
Mon, 22 Apr 2019 18:20:13 +0000 (11:20 -0700)
* fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios)

* remove ARFLAGS

* tmk_core/arm_atsam.mk:AR: remove 'rcs'

tmk_core/arm_atsam.mk
tmk_core/avr.mk
tmk_core/rules.mk

index 06823fb629f964140690c73816b79bc528d78e48..25a3411f4f9f90af1ec4183cf0d38b59928b2eed 100644 (file)
@@ -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)
index f6af3f5e29084d3cea157d448d05615a601a3c04..6bf86d58a8c9da90faeeb5f3585369b52777d955 100644 (file)
@@ -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)
index 3a322cee4f2569be177c97dd0c70e0a81fb57e26..6d2bb51f075da45feaa7e10c1aa228f15ad8331c 100644 (file)
@@ -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: