If the config file is reassigned through the KCONFIG_CONFIG makeflag/envvar, this rule still attempts to use the wrong, possibly nonexistent file. Let's fix that. Signed-off-by: Arseny Maslennikov <ar@xxxxxxxxx> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d5713e7b1e50..4d8760166a47 100644 --- a/Makefile +++ b/Makefile @@ -1199,9 +1199,9 @@ kselftest-clean: PHONY += kselftest-merge kselftest-merge: - $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) + $(if $(wildcard $(objtree)/$(KCONFIG_CONFIG)),, $(error No $(KCONFIG_CONFIG) exists, config your kernel first!)) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ - -m $(objtree)/.config \ + -m $(objtree)/$(KCONFIG_CONFIG) \ $(srctree)/tools/testing/selftests/*/config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig -- 2.20.1
