path: root/Makefile
diff options
authorLinus Torvalds <>2021-07-18 11:10:30 -0700
committerLinus Torvalds <>2021-07-18 11:10:30 -0700
commit6750691a82ad264dff140a7e9ca8f340729431f0 (patch)
tree4de307a69ad5483e38815710b06c88e7d72c2389 /Makefile
parent1d67c8d993baf8ab6be8a2154b1a94ec1311c869 (diff)
parent5e60f363b38fd40e4d8838b5d6f4d4ecee92c777 (diff)
Merge tag 'kbuild-fixes-v5.14' of git://
Pull Kbuild fixes from Masahiro Yamada: - Restore the original behavior of scripts/setlocalversion when LOCALVERSION is set to empty. - Show Kconfig prompts even for 'make -s' - Fix the combination of COFNIG_LTO_CLANG=y and CONFIG_MODVERSIONS=y for older GNU Make versions * tag 'kbuild-fixes-v5.14' of git:// Documentation: Fix intiramfs script name Kbuild: lto: fix module versionings mismatch in GNU make 3.X kbuild: do not suppress Kconfig prompts for silent build scripts/setlocalversion: fix a bug when LOCALVERSION is empty
Diffstat (limited to 'Makefile')
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e97e7548315c..0517005d65fa 100644
--- a/Makefile
+++ b/Makefile
@@ -728,11 +728,12 @@ $(KCONFIG_CONFIG):
# This exploits the 'multi-target pattern rule' trick.
# The syncconfig should be executed only once to make all the targets.
# (Note: use the grouped target '&:' when we bump to GNU Make 4.3)
-quiet_cmd_syncconfig = SYNC $@
- cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig
+# Do not use $(call cmd,...) here. That would suppress prompts from syncconfig,
+# so you cannot notice that Kconfig is waiting for the user input.
%/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG)
- +$(call cmd,syncconfig)
+ $(Q)$(kecho) " SYNC $@"
+ $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig
else # !may-sync-config
# External modules and some install targets need include/generated/autoconf.h
# and include/config/auto.conf but do not care if they are up-to-date.