History

kbuild: mergeconfig: remove redundant $(objtree)

Kbuild always runs in $(objtree). Actually, $(objtree) is always set to "." by the top-level Makefile. We can omit "-O $(objtree)" and "$(objtree)/".

Masahiro Yamada committed 11 years ago

Commit 371cfd41 parent b9fe99c1 file · +1 −1Browse files

Showing the changes to scripts/kconfig (1 of 1 file). Show all

Unified · Split

scripts/kconfig/Makefile+1−1
@@ -108,7 +108,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(S · 107 unmodified lines
108108
109109 define mergeconfig
110110 $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture))
111−$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1))
111+$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(call configfiles,$(1))
112112 +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
113113 endef
114114