riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14009 from aabadie/pr/make/fix-info-build-output

Browse Source 
makefiles/info.inc.mk: fix supported boards output
This commit is contained in:
Alexandre Abadie 2020-05-26 12:36:58 +02:00 committed by GitHub
commit e4639fc7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.include
View File

@ -99,8 +99,11 @@ endif
ifneq (,$(BOARDSDIR)) ifneq (,$(BOARDSDIR))
# Only warn users, not the CI. # Only warn users, not the CI.
ifneq ($(RIOT_CI_BUILD),1) ifneq ($(RIOT_CI_BUILD),1)
$(warning Using BOARDSDIR is deprecated use EXTERNAL_BOARD_DIRS instead) # Do not warn when set from sub-make
$(info EXTERNAL_BOARD_DIRS can contain multiple folders separated by space) ifeq ($(MAKELEVEL),0)
$(warning Using BOARDSDIR is deprecated use EXTERNAL_BOARD_DIRS instead)
$(info EXTERNAL_BOARD_DIRS can contain multiple folders separated by space)
endif
endif endif
EXTERNAL_BOARD_DIRS += $(BOARDSDIR) EXTERNAL_BOARD_DIRS += $(BOARDSDIR)
endif endif
@ -183,10 +186,6 @@ GLOBAL_GOALS += buildtest \
# #
ifneq (, $(filter $(GLOBAL_GOALS), $(MAKECMDGOALS))) ifneq (, $(filter $(GLOBAL_GOALS), $(MAKECMDGOALS)))
BOARD=none
endif
ifeq (none,$(BOARD))
include $(RIOTMAKE)/info-global.inc.mk include $(RIOTMAKE)/info-global.inc.mk
include $(RIOTMAKE)/buildtests.inc.mk include $(RIOTMAKE)/buildtests.inc.mk
else else
@ -947,7 +946,7 @@ ifneq ($(_BASELIBS_VALUE_BEFORE_USAGE),$(BASELIBS))
$(error BASELIBS value changed) $(error BASELIBS value changed)
endif endif
endif # BOARD=none endif
# include RIOT_MAKEFILES_GLOBAL_POST configuration files # include RIOT_MAKEFILES_GLOBAL_POST configuration files
# allows setting user specific system wide configuration parsed after the body # allows setting user specific system wide configuration parsed after the body