mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
build: fix auto defconfig rule
We should only run "defconfig" if ".config" is missing. Commit317c98cb91have added a dependency on "tools/fixdep", so make would start runnning "defconfig" also when "tools/fixdep" is newer than ".config" and thus overwrite any changes made by a developer. Reintroduce intended behavior of the rule to only generate a default Kconfig when ".config" is missing. Fixes:317c98cb91("build: hook kconfig into xen build system") Reported-by: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
1 parent
7d9589239e
commit
10f1f7b010
1 file changed
+3
-8
+3
-8
@@ -243,15 +243,10 @@ ifeq ($(need-config),y)
|
||||
# changes are detected.
|
||||
-include include/config/auto.conf.cmd
|
||||
|
||||
# This allows make to build fixdep before invoking defconfig. We can't use
|
||||
# "tools_fixdep" which is a .PHONY target and would force make to call
|
||||
# "defconfig" again to update $(KCONFIG_CONFIG).
|
||||
tools/fixdep:
|
||||
$(Q)$(MAKE) $(build)=tools tools/fixdep
|
||||
|
||||
# Allow people to just run `make` as before and not force them to configure
|
||||
$(KCONFIG_CONFIG): tools/fixdep
|
||||
$(Q)$(MAKE) $(build)=tools/kconfig defconfig
|
||||
# Only run defconfig if $(KCONFIG_CONFIG) is missing
|
||||
$(KCONFIG_CONFIG): tools_fixdep
|
||||
$(if $(wildcard $@), , $(Q)$(MAKE) $(build)=tools/kconfig defconfig)
|
||||
|
||||
# The actual configuration files used during the build are stored in
|
||||
# include/generated/ and include/config/. Update them if .config is newer than
|
||||
|
||||