[PATCH] kbuild: fix typo in --no-whole-archive flag

[PATCH] kbuild: fix typo in --no-whole-archive flag

[Clement Leger]

"whole" was replaced with "while" during a previous patch. Fix this flag
to allow building correctly.

Fixes 0a78b33954 ("kbuild: switch over to thin archive")
Signed-off-by: Clement Leger <cleger@kalray.eu>
---
 arch/kvx/Makefile      | 2 +-
 arch/mips/pbl/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/kvx/Makefile b/arch/kvx/Makefile
index 9e7c8c07f..13c4e2431 100644
--- a/arch/kvx/Makefile
+++ b/arch/kvx/Makefile
@@ -30,6 +30,6 @@ lds-y += arch/kvx/cpu/barebox.lds
 
 cmd_barebox__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_barebox) -o $@ \
       -T $(BAREBOX_LDS) \
-      --whole-archive $(BAREBOX_OBJS) --no-while-archive \
+      --whole-archive $(BAREBOX_OBJS) --no-whole-archive \
       -L$(LIBGCC_PATH) -lgcc \
       $(filter-out $(BAREBOX_LDS) $(BAREBOX_OBJS) FORCE ,$^)
diff --git a/arch/mips/pbl/Makefile b/arch/mips/pbl/Makefile
index 3bd0df165..f85c7a6d6 100644
--- a/arch/mips/pbl/Makefile
+++ b/arch/mips/pbl/Makefile
@@ -31,7 +31,7 @@ zbarebox-lds := $(obj)/zbarebox.lds
 quiet_cmd_zbarebox__ ?= LD      $@
       cmd_zbarebox__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_zbarebox) -o $@ \
       -T $(zbarebox-lds)                                           \
-      --whole-archive $(zbarebox-common) --no-while-archive        \
+      --whole-archive $(zbarebox-common) --no-whole-archive        \
       $(filter-out $(zbarebox-lds) $(zbarebox-common) FORCE ,$^)
 
 $(obj)/zbarebox: $(zbarebox-lds) $(zbarebox-common) FORCE
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] kbuild: fix typo in --no-whole-archive flag

[Sascha Hauer]

On Tue, Jun 23, 2020 at 05:08:23PM +0200, Clement Leger wrote:
> "whole" was replaced with "while" during a previous patch. Fix this flag
> to allow building correctly.
> 
> Fixes 0a78b33954 ("kbuild: switch over to thin archive")
> Signed-off-by: Clement Leger <cleger@kalray.eu>
> ---
>  arch/kvx/Makefile      | 2 +-
>  arch/mips/pbl/Makefile | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks

Sascha

> 
> diff --git a/arch/kvx/Makefile b/arch/kvx/Makefile
> index 9e7c8c07f..13c4e2431 100644
> --- a/arch/kvx/Makefile
> +++ b/arch/kvx/Makefile
> @@ -30,6 +30,6 @@ lds-y += arch/kvx/cpu/barebox.lds
>  
>  cmd_barebox__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_barebox) -o $@ \
>        -T $(BAREBOX_LDS) \
> -      --whole-archive $(BAREBOX_OBJS) --no-while-archive \
> +      --whole-archive $(BAREBOX_OBJS) --no-whole-archive \
>        -L$(LIBGCC_PATH) -lgcc \
>        $(filter-out $(BAREBOX_LDS) $(BAREBOX_OBJS) FORCE ,$^)
> diff --git a/arch/mips/pbl/Makefile b/arch/mips/pbl/Makefile
> index 3bd0df165..f85c7a6d6 100644
> --- a/arch/mips/pbl/Makefile
> +++ b/arch/mips/pbl/Makefile
> @@ -31,7 +31,7 @@ zbarebox-lds := $(obj)/zbarebox.lds
>  quiet_cmd_zbarebox__ ?= LD      $@
>        cmd_zbarebox__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_zbarebox) -o $@ \
>        -T $(zbarebox-lds)                                           \
> -      --whole-archive $(zbarebox-common) --no-while-archive        \
> +      --whole-archive $(zbarebox-common) --no-whole-archive        \
>        $(filter-out $(zbarebox-lds) $(zbarebox-common) FORCE ,$^)
>  
>  $(obj)/zbarebox: $(zbarebox-lds) $(zbarebox-common) FORCE
> -- 
> 2.17.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox