From 017fc36c7b0e0e2df3e981c9d0dc2f11c5f68fbc Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Mon, 22 Feb 2021 15:58:04 +0100 Subject: [PATCH] makefiles/kconfig: include out.config only when running Kconfig --- makefiles/kconfig.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/makefiles/kconfig.mk b/makefiles/kconfig.mk index 42bfafbe6d..96f9b57459 100644 --- a/makefiles/kconfig.mk +++ b/makefiles/kconfig.mk @@ -43,11 +43,6 @@ KCONFIG_OUT_CONFIG = $(GENERATED_DIR)/out.config # whenever a change occurs on one of the previously used Kconfig files. KCONFIG_OUT_DEP = $(KCONFIG_OUT_CONFIG).d -# Include configuration symbols if available. This allows to check for Kconfig -# symbols in makefiles. Make tries to 'remake' all included files (see -# https://www.gnu.org/software/make/manual/html_node/Remaking-Makefiles.html). --include $(KCONFIG_OUT_CONFIG) - # Add configurations to merge, in ascendent priority (i.e. a file overrides the # previous ones). # @@ -101,6 +96,11 @@ export SHOULD_RUN_KCONFIG ifneq (,$(SHOULD_RUN_KCONFIG)) +# Include configuration symbols if available. This allows to check for Kconfig +# symbols in makefiles. Make tries to 'remake' all included files (see +# https://www.gnu.org/software/make/manual/html_node/Remaking-Makefiles.html). +-include $(KCONFIG_OUT_CONFIG) + # Add configuration header to build dependencies BUILDDEPS += $(KCONFIG_GENERATED_AUTOCONF_HEADER_C) $(FIXDEP)