From: Ivan Grokhotkov <ivan@espressif.com>
Date: Sat, 28 Apr 2018 11:57:00 +0000 (+0800)
Subject: build: allow EXCLUDE_COMPONENTS to contain quotes
X-Git-Tag: v3.1-beta1~31^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2f498f7da4ad904a16e8f2c5211611fb1f9f365;p=esp-idf

build: allow EXCLUDE_COMPONENTS to contain quotes

'dequote' macro can’t be used at this point yet, use subst directly.
Also prevent EXCLUDE_COMPONENTS from being passed to bootloader build.
---

diff --git a/components/bootloader/Makefile.projbuild b/components/bootloader/Makefile.projbuild
index 7876635cc9..1d569bab3c 100644
--- a/components/bootloader/Makefile.projbuild
+++ b/components/bootloader/Makefile.projbuild
@@ -32,7 +32,8 @@ BOOTLOADER_MAKE= +\
 	V=$(V) \
 	BUILD_DIR_BASE=$(BOOTLOADER_BUILD_DIR) \
 	TEST_COMPONENTS= \
-	TESTS_ALL=
+	TESTS_ALL= \
+	EXCLUDE_COMPONENTS=
 
 .PHONY: bootloader-clean bootloader-flash bootloader-list-components bootloader $(BOOTLOADER_BIN)
 
diff --git a/make/project.mk b/make/project.mk
index 01b29bcb38..636e46fc3b 100644
--- a/make/project.mk
+++ b/make/project.mk
@@ -153,7 +153,8 @@ COMPONENTS := $(sort $(foreach comp,$(COMPONENTS),$(lastword $(subst /, ,$(comp)
 endif
 # After a full manifest of component names is determined, subtract the ones explicitly omitted by the project Makefile.
 ifdef EXCLUDE_COMPONENTS
-COMPONENTS := $(filter-out $(EXCLUDE_COMPONENTS), $(COMPONENTS))
+COMPONENTS := $(filter-out $(subst ",,$(EXCLUDE_COMPONENTS)), $(COMPONENTS)) 
+# to keep syntax highlighters happy: "))
 endif
 export COMPONENTS