scripts/kconfig: allow building with make 3.80 again
diff mbox

Message ID 56A65F4B02000078000CAC75@prv-mh.provo.novell.com
State New
Headers show

Commit Message

Jan Beulich Jan. 25, 2016, 4:45 p.m. UTC
Documentation/Changes still lists this as the minimal required version,
so it ought to remain usable for the time being.

Fixes: d2036f30cf ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
---
 scripts/kconfig/Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)




--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Michal Marek Feb. 1, 2016, 11:16 a.m. UTC | #1
Dne 25.1.2016 v 17:45 Jan Beulich napsal(a):
> Documentation/Changes still lists this as the minimal required version,
> so it ought to remain usable for the time being.
> 
> Fixes: d2036f30cf ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target")
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> ---
>  scripts/kconfig/Makefile |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Sorry for the delay, applied to kbuild.git#kconfig now.

Michal

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michael Ellerman Feb. 8, 2016, 3:51 a.m. UTC | #2
On Mon, 2016-02-01 at 12:16 +0100, Michal Marek wrote:

> Dne 25.1.2016 v 17:45 Jan Beulich napsal(a):

> > Documentation/Changes still lists this as the minimal required version,
> > so it ought to remain usable for the time being.
> > 
> > Fixes: d2036f30cf ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target")
> > Signed-off-by: Jan Beulich <jbeulich@suse.com>
> > Cc: Michael Ellerman <mpe@ellerman.id.au>
> > ---
> >  scripts/kconfig/Makefile |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Sorry for the delay, applied to kbuild.git#kconfig now.

Erk, sorry for breaking it.

I guess somewhere we need a system with an old make on it for testing this
stuff. Nothing I have around has make that old though, Ubuntu 10.04 and Debian
6.0 both have 3.81 and I don't have anything older.

cheers

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

--- 4.5-rc1/scripts/kconfig/Makefile
+++ 4.5-rc1-kconfig-make-3-80/scripts/kconfig/Makefile
@@ -96,13 +96,15 @@  savedefconfig: $(obj)/conf
 defconfig: $(obj)/conf
 ifeq ($(KBUILD_DEFCONFIG),)
 	$< $(silent) --defconfig $(Kconfig)
-else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
+else
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
 	@$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
 	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 else
 	@$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
 	$(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
 endif
+endif
 
 %_defconfig: $(obj)/conf
 	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)