summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakeshi ISHII <2170248+mtei@users.noreply.github.com>2019-05-03 15:20:23 +0200
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-03 15:20:23 +0200
commit29f68459a01c155ca64aed4ec0ba083d0dee0d2e (patch)
tree9e38fd7707db426b1ccd38e55f7cbd44cccc3df5
parent6a59198a42d49422297ee9320e5d842592573297 (diff)
downloadqmk_firmware-29f68459a01c155ca64aed4ec0ba083d0dee0d2e.tar.gz
qmk_firmware-29f68459a01c155ca64aed4ec0ba083d0dee0d2e.tar.xz
Fix LIB_SRC insert position (#5731)
The insertion point for `$(patsubst %.c,%.clib,$(LIB_SRC))` must be after all normal `SRC += ..` . I modified it to be so. Because LIB_SRC and SRC are assumed to be used in pairs. Similarly, QUANTUM_LIB_SRC and QUANTUM_SRC are assumed to be used in pairs.
-rw-r--r--build_keyboard.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 510923ebe..213cb4445 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -324,7 +324,6 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
endif
# # project specific files
-SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
SRC += $(KEYBOARD_SRC) \
$(KEYMAP_C) \
$(QUANTUM_SRC)
@@ -343,6 +342,7 @@ include $(TMK_PATH)/protocol.mk
include $(TMK_PATH)/common.mk
include bootloader.mk
+SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
SRC += $(TMK_COMMON_SRC)
OPT_DEFS += $(TMK_COMMON_DEFS)