Skip to content

Makefile.include: resolve dependencies before Makefile.include #14351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandrolanzieri merged 2 commits into from
Jun 26, 2020
Merged

Makefile.include: resolve dependencies before Makefile.include #14351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4383599
Makefile.include: resolve dependencies before Makefile.include
fjmolinas Jun 23, 2020
9dea6a1
boards/common/nrf52: revert early inclusion of Makefile.dep
Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,12 @@ include $(RIOTBASE)/Makefile.features
include $(RIOTMAKE)/pseudomodules.inc.mk
include $(RIOTMAKE)/defaultmodules.inc.mk

# handle removal of default modules
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))

# process dependencies
include $(RIOTMAKE)/dependency_resolution.inc.mk

# Include Board and CPU configuration
INCLUDES += $(addprefix -I,$(wildcard $(BOARDDIR)/include))
include $(BOARDDIR)/Makefile.include
Expand All @@ -385,12 +391,6 @@ include $(RIOTMAKE)/toolchain/$(TOOLCHAIN).inc.mk
# For more information, see http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html
export CCACHE_CPP2=yes

# handle removal of default modules
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))

# process dependencies
include $(RIOTMAKE)/dependency_resolution.inc.mk

ifeq ($(strip $(MCU)),)
MCU = $(CPU)
endif
Expand Down
8 changes: 0 additions & 8 deletions boards/common/nrf52/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ endif
# setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk

# The following configuration are dependencies specific, specifically they need
# to know if 'nordic_softdevice_ble' is used. The dependencies are not known
# because BOARDs Makefile.include are included before Makefile.dep
# This HACK can be removed either when Makefile.include is included after
# Makefile.features (see #9913) or if 'nordic_softdevice_ble' is deprecated.
-include $(APPDIR)/Makefile.board.dep
include $(BOARDDIR)/Makefile.dep

PROGRAMMER ?= jlink
ifeq (jlink,$(PROGRAMMER))
# setup JLink for flashing
Expand Down