From 9d8e11020261749ea0e9c62cd2178facf914585f Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 16 Dec 2016 11:30:37 +1100 Subject: [PATCH] Build system: Deal with the case where IDF_PATH contains ~ See github issue https://github.com/espressif/esp-idf/issues/118 (This is easier to work around in the build system than to document.) --- make/project.mk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/make/project.mk b/make/project.mk index 0548002277..948bfda1f7 100644 --- a/make/project.mk +++ b/make/project.mk @@ -44,6 +44,22 @@ $(warning "esp-idf build system only supports GNU Make versions 3.81 or newer. Y endif endif +# make IDF_PATH an absolute path +# (works around the case where a shell character is embedded in the environment variable value.) +export IDF_PATH:=$(wildcard $(IDF_PATH)) + +ifndef IDF_PATH +$(error IDF_PATH variable is not set to a valid directory.) +endif + +ifneq ("$(IDF_PATH)","$(wildcard $(IDF_PATH))") +# due to the way make manages variables, this is hard to account for +# +# if you see this error, do the shell expansion in the shell ie +# make IDF_PATH=~/blah not make IDF_PATH="~/blah" +$(error If IDF_PATH is overriden on command line, it must be an absolute path with no embedded shell special characters) +endif + # disable built-in make rules, makes debugging saner MAKEFLAGS_OLD := $(MAKEFLAGS) MAKEFLAGS +=-rR @@ -345,7 +361,7 @@ $(foreach component,$(TEST_COMPONENT_PATHS),$(eval $(call GenerateComponentTarge app-clean: $(addsuffix -clean,$(notdir $(COMPONENT_PATHS_BUILDABLE))) $(summary) RM $(APP_ELF) rm -f $(APP_ELF) $(APP_BIN) $(APP_MAP) - + size: $(APP_ELF) $(SIZE) $(APP_ELF) -- 2.40.0