diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-13 02:21:40 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2015-03-24 11:48:44 -0400 |
| commit | 371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d (patch) | |
| tree | 6007027dba4ecd98ac50153e831895f61a0bad16 | |
| parent | b9fe99c5b994c6ddc57780993966b18899526c0b (diff) | |
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)/".
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/kconfig/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index be0fad44ddd8..b0e4be28204d 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -108,7 +108,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(S | |||
| 108 | 108 | ||
| 109 | define mergeconfig | 109 | define mergeconfig |
| 110 | $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture)) | 110 | $(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)) |
| 112 | +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig | 112 | +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig |
| 113 | endef | 113 | endef |
| 114 | 114 | ||