build system: Fix defconfig vs menuconfig regression in 155f9124

diff --git a/make/build_examples.sh b/make/build_examples.sh
index d264862874539112f920cd53aef714cb70b569fb..53cba23b1e5f8f73f3e9f3f275374d154e46f8ab 100755 (executable)
--- a/make/build_examples.sh
+++ b/make/build_examples.sh
@@ -22,7 +22,7 @@ for example in ${IDF_PATH}/examples/*; do
        pushd ${EXAMPLE_NUM}/`basename ${example}`
        # can't do "make defconfig all" as this will trip menuconfig
        # sometimes
-       make defconfig && make || RESULT=$?
+       make defconfig V=1 && make V=1 || RESULT=$?
        popd
        EXAMPLE_NUM=$(( $EXAMPLE_NUM + 1 ))
 done

diff --git a/make/project_config.mk b/make/project_config.mk
index 4d0f6c2059df5aa1db43c6b628c3650dc5d47a49..555086fb8d0730b590699bc59e5263f9360fab40 100644 (file)
--- a/make/project_config.mk
+++ b/make/project_config.mk
@@ -21,13 +21,17 @@ KCONFIG_TOOL_ENV=KCONFIG_AUTOHEADER=$(abspath $(BUILD_DIR_BASE)/include/sdkconfi
        COMPONENT_KCONFIGS="$(COMPONENT_KCONFIGS)" KCONFIG_CONFIG=$(SDKCONFIG) \
        COMPONENT_KCONFIGS_PROJBUILD="$(COMPONENT_KCONFIGS_PROJBUILD)"
 
-menuconfig: $(KCONFIG_TOOL_DIR)/mconf $(IDF_PATH)/Kconfig $(BUILD_DIR_BASE)
+menuconfig: $(KCONFIG_TOOL_DIR)/mconf $(IDF_PATH)/Kconfig
        $(summary) MENUCONFIG
        $(Q) $(KCONFIG_TOOL_ENV) $(KCONFIG_TOOL_DIR)/mconf $(IDF_PATH)/Kconfig
 
 ifeq ("$(wildcard $(SDKCONFIG))","")
-#No sdkconfig found. Need to run menuconfig to make this if we need it.
+ifeq ("$(filter defconfig,$(MAKECMDGOALS))","")
+# if not configuration is present and defconfig is not a target, run makeconfig
 $(SDKCONFIG): menuconfig
+else
+$(SDKCONFIG): defconfig
+endif
 endif
 
 defconfig: $(KCONFIG_TOOL_DIR)/mconf $(IDF_PATH)/Kconfig $(BUILD_DIR_BASE)