From 1b0d9ef14bb7c6b60152d53903a6c0b74d98715b Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser <kaspar@schleiser.de> Date: Wed, 20 Jul 2016 19:58:17 +0200 Subject: [PATCH] make: treat packages like modules when it comes to linking --- Makefile.include | 1 - Makefile.modules | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.include b/Makefile.include index 87d3073feb..2cd68506dc 100644 --- a/Makefile.include +++ b/Makefile.include @@ -236,7 +236,6 @@ endif # the binaries to link BASELIBS += $(BINDIR)${APPLICATION}.a -BASELIBS += $(USEPKG:%=${BINDIR}%.a) BASELIBS += $(APPDEPS) .PHONY: all clean flash term doc debug debug-server reset objdump help info-modules diff --git a/Makefile.modules b/Makefile.modules index 4a0a990b86..1fe2f48fcc 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -3,7 +3,7 @@ USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL ED = $(addprefix FEATURE_,$(sort $(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED)))) ED += $(addprefix MODULE_,$(sort $(USEMODULE) $(USEPKG))) EXTDEFINES = $(addprefix -D,$(shell echo '$(ED)' | tr 'a-z-' 'A-Z_')) -REALMODULES = $(filter-out $(PSEUDOMODULES), $(sort $(USEMODULE))) +REALMODULES = $(filter-out $(PSEUDOMODULES), $(sort $(USEMODULE) $(USEPKG))) export BASELIBS += $(REALMODULES:%=$(BINDIR)%.a) CFLAGS += $(EXTDEFINES) -- GitLab