Message ID | 20190309131235.31823-1-ar@cs.msu.ru (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | scripts/kconfig/Makefile: kvmconfig: use KCONFIG_CONFIG if set | expand |
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 181973509a05..1c7ac07def4d 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -93,7 +93,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.config: $(obj)/conf $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m $(KCONFIG_CONFIG) $(configfiles) +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig PHONY += kvmconfig