RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

makefiles/info-global.inc.mk: fix info-boards-supported

Browse Source 
When using eval the function board_unsatisfied_features is evaluated
twice, in the first evaluation this will lead to the previous value
for `BOARDS` to be expanded, so escape all occurrences.
This commit is contained in:
Francisco Molina 2020-05-25 09:39:27 +02:00
parent ee319a40ed
commit 1c01e46956
No known key found for this signature in database
GPG Key ID: 3E94EAC3DBDEEDA8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
makefiles/info-global.inc.mk
View File

@ -35,7 +35,7 @@ define board_unsatisfied_features
FEATURES_BLACKLIST:= $(FEATURES_BLACKLIST_GLOBAL)
# Find matching board folder
BOARDDIR := $(word 1,$(foreach dir,$(BOARDSDIRS),$(wildcard $(dir)/$(BOARD)/.)))
BOARDDIR := $$(word 1,$$(foreach dir,$$(BOARDSDIRS),$$(wildcard $$(dir)/$$(BOARD)/.)))
# Remove board specific variables set by Makefile.features/Makefile.dep
FEATURES_PROVIDED :=
@ -57,19 +57,19 @@ define board_unsatisfied_features
ifneq (,$$(FEATURES_MISSING))
# Skip full dependency resolution, as even without optional modules features
# and architecture specific limitations already some features are missing
BOARDS_FEATURES_MISSING += "$(1) $$(FEATURES_MISSING)"
BOARDS_WITH_MISSING_FEATURES += $(1)
BOARDS_FEATURES_MISSING += "$$(BOARD) $$(FEATURES_MISSING)"
BOARDS_WITH_MISSING_FEATURES += $$(BOARD)
else
include $(RIOTMAKE)/dependency_resolution.inc.mk
ifneq (,$$(FEATURES_MISSING))
BOARDS_FEATURES_MISSING += "$(1) $$(FEATURES_MISSING)"
BOARDS_WITH_MISSING_FEATURES += $(1)
BOARDS_FEATURES_MISSING += "$$(BOARD) $$(FEATURES_MISSING)"
BOARDS_WITH_MISSING_FEATURES += $$(BOARD)
endif
ifneq (,$$(FEATURES_USED_BLACKLISTED))
BOARDS_FEATURES_USED_BLACKLISTED += "$(1) $$(FEATURES_USED_BLACKLISTED)"
BOARDS_WITH_BLACKLISTED_FEATURES += $(1)
BOARDS_FEATURES_USED_BLACKLISTED += "$$(BOARD) $$(FEATURES_USED_BLACKLISTED)"
BOARDS_WITH_BLACKLISTED_FEATURES += $$(BOARD)
endif
endif
@ -86,7 +86,7 @@ BOARDS_FEATURES_MISSING :=
BOARDS_WITH_BLACKLISTED_FEATURES :=
BOARDS_FEATURES_USED_BLACKLISTED :=
$(foreach BOARD, $(BOARDS), $(eval $(call board_unsatisfied_features,$(BOARD))))
$(foreach board,$(BOARDS),$(eval $(call board_unsatisfied_features,$(board))))
BOARDS := $(filter-out $(BOARDS_WITH_MISSING_FEATURES) $(BOARDS_WITH_BLACKLISTED_FEATURES), $(BOARDS))
info-buildsizes: SHELL=bash