From a1c8a1470533fc62494b8a6370fae4355ee727aa Mon Sep 17 00:00:00 2001 From: smlng Date: Thu, 24 Aug 2017 13:27:07 +0200 Subject: [PATCH 1/2] makefiles,buildtests: omit recursive make --- makefiles/buildtests.inc.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makefiles/buildtests.inc.mk b/makefiles/buildtests.inc.mk index 8679ed5f25..3ddfbdccc0 100644 --- a/makefiles/buildtests.inc.mk +++ b/makefiles/buildtests.inc.mk @@ -38,7 +38,7 @@ buildtest: @ \ BUILDTESTOK=true; \ APP_RETRY=0; \ - for BOARD in $$($(MAKE) -s info-boards-supported); do \ + for BOARD in ${BOARDS}; do \ RIOTNOLINK=$$(echo $(BOARD_INSUFFICIENT_MEMORY) | grep "\<$${BOARD}\>" 2>&1 >/dev/null && echo 1); \ ${COLOR_ECHO} -n "Building for $${BOARD} "; \ [ -n "$${RIOTNOLINK}" ] && ${COLOR_ECHO} -n "(no linking) "; \ @@ -125,7 +125,7 @@ info-buildsize: info-buildsizes: SHELL=bash info-buildsizes: @echo -e " text\t data\t bss\t dec\tboard"; \ - for BOARD in $$($(MAKE) -s info-boards-supported); do \ + for BOARD in ${BOARDS}; do \ echo "$$(env -i \ HOME=$${HOME} \ PATH=$${PATH} \ @@ -142,7 +142,7 @@ info-buildsizes: info-buildsizes-diff: SHELL=bash info-buildsizes-diff: @echo -e "text\tdata\tbss\tdec\tBOARD/BINDIRBASE\n"; \ - for BOARD in $$($(MAKE) -s info-boards-supported); do \ + for BOARD in ${BOARDS}; do \ for BINDIRBASE in $${OLDBIN} $${NEWBIN}; do \ env -i \ HOME=$${HOME} \ @@ -255,7 +255,7 @@ info-boards-features-missing: FEATURES_REQUIRED += $(FEATURES_OPTIONAL) -ifneq (, $(filter info-boards-supported info-boards-features-missing info-build, $(MAKECMDGOALS))) +ifneq (, $(filter buildtest info-boards-supported info-boards-features-missing info-build info-buildsizes info-buildsizes-diff, $(MAKECMDGOALS))) FEATURES_PROVIDED_BAK := $(FEATURES_PROVIDED) define board_missing_features From 2c4a8c4f96a8878d957d2c7ff2a63a17834955bd Mon Sep 17 00:00:00 2001 From: smlng Date: Thu, 24 Aug 2017 13:28:04 +0200 Subject: [PATCH 2/2] makefiles,buildtests: fix parameters for size command on macOS --- makefiles/buildtests.inc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/buildtests.inc.mk b/makefiles/buildtests.inc.mk index 3ddfbdccc0..714528402a 100644 --- a/makefiles/buildtests.inc.mk +++ b/makefiles/buildtests.inc.mk @@ -114,13 +114,13 @@ info-objsize: *) echo "Usage: $(MAKE) info-objsize SORTROW=[text|data|bss|dec]" ; return ;; \ esac; \ echo -e ' text\t data\t bss\t dec\t hex\tfilename'; \ - $(SIZE) -dB $(BASELIBS) | \ + $(SIZE) -d -B $(BASELIBS) | \ tail -n+2 | \ sed -e 's#$(BINDIR)##' | \ sort -rnk$${SORTROW} info-buildsize: - @$(SIZE) -dB $(BINDIR)/$(APPLICATION).elf || echo '' + @$(SIZE) -d -B $(BINDIR)/$(APPLICATION).elf || echo '' info-buildsizes: SHELL=bash info-buildsizes: