blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-11 18:19:07 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/make_undefined_variable_warning' into 'master'

Browse Source 
make: fix undefined variable warning (IDF_SKIP_CHECK_SUBMODULES)

See merge request espressif/esp-idf!7061
This commit is contained in:
Angus Gratton 2019-12-20 10:59:28 +08:00
commit 4344add798
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/project.mk
View File

@ -634,9 +634,13 @@ clean: app-clean bootloader-clean config-clean ldgen-clean
# or out of date, and exit if so. Components can add paths to this variable. # or out of date, and exit if so. Components can add paths to this variable.
# #
# This only works for components inside IDF_PATH # This only works for components inside IDF_PATH
#
# For internal use:
# IDF_SKIP_CHECK_SUBMODULES may be set in the environment to skip the submodule check.
# This can be used e.g. in CI when submodules are checked out by different means.
IDF_SKIP_CHECK_SUBMODULES ?= 0
check-submodules: check-submodules:
# for internal use:
# skip submodule check if running on Gitlab CI and job is configured as not clone submodules
ifeq ($(IDF_SKIP_CHECK_SUBMODULES),1) ifeq ($(IDF_SKIP_CHECK_SUBMODULES),1)
@echo "skip submodule check on internal CI" @echo "skip submodule check on internal CI"
else else
@ -667,7 +671,7 @@ endef
# so the argument is suitable for use with 'git submodule' commands # so the argument is suitable for use with 'git submodule' commands
$(foreach submodule,$(subst $(IDF_PATH)/,,$(filter $(IDF_PATH)/%,$(COMPONENT_SUBMODULES))),$(eval $(call GenerateSubmoduleCheckTarget,$(submodule)))) $(foreach submodule,$(subst $(IDF_PATH)/,,$(filter $(IDF_PATH)/%,$(COMPONENT_SUBMODULES))),$(eval $(call GenerateSubmoduleCheckTarget,$(submodule))))
endif # End check for .gitmodules existence endif # End check for .gitmodules existence
endif endif # End check for IDF_SKIP_CHECK_SUBMODULES
# PHONY target to list components in the build and their paths # PHONY target to list components in the build and their paths
list-components: list-components: