[PATCH 0/4] tools/nolibc: clean up the Makefile a bit

[PATCH 0/4] tools/nolibc: clean up the Makefile a bit

[Thomas Weißschuh]

The nolibc installation Makefile contains some cruft, clean it up.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
Thomas Weißschuh (4):
      tools/nolibc: drop superfluous invocation of 'make headers'
      tools/nolibc: drop superfluous invocation of mkdir
      tools/nolibc: drop superfluous definition of Q
      tools/nolibc: explicitly list architecture headers

 tools/include/nolibc/Makefile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
---
base-commit: 996de6c4de1016140d3a0582b17b946ffc2f9725
change-id: 20260401-nolibc-cleanup-9dc741912e37

Best regards,
--  
Thomas Weißschuh <linux@weissschuh.net>

[PATCH 1/4] tools/nolibc: drop superfluous invocation of 'make headers'

[Thomas Weißschuh]

The headers_install target of the toplevel Makefile will already make
sure that the headers are up-to-date.

Drop the superfluous explicit invocation.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 tools/include/nolibc/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index e3a2ec9b2e43..47ba2bde6d44 100644
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -102,7 +102,6 @@ headers:
 	$(Q)cp --parents $(arch_files) $(all_files) "$(OUTPUT)sysroot/include/"
 
 headers_standalone: headers
-	$(Q)$(MAKE) -C $(srctree) headers
 	$(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=$(OUTPUT)sysroot
 
 CFLAGS_s390 := -m64

-- 
2.53.0

[PATCH 2/4] tools/nolibc: drop superfluous invocation of mkdir

[Thomas Weißschuh]

The call to 'mkdir -p $(OUTPUT)sysroot/include' will also create the
sysroot directory.

Drop the unnecessary explicit invocation of mkdir.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 tools/include/nolibc/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index 47ba2bde6d44..df9304e6d818 100644
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -97,7 +97,6 @@ help:
 
 # installs headers for all archs at once.
 headers:
-	$(Q)mkdir -p "$(OUTPUT)sysroot"
 	$(Q)mkdir -p "$(OUTPUT)sysroot/include"
 	$(Q)cp --parents $(arch_files) $(all_files) "$(OUTPUT)sysroot/include/"
 

-- 
2.53.0

[PATCH 3/4] tools/nolibc: drop superfluous definition of Q

[Thomas Weißschuh]

Q is already defined by tools/scripts/Makefile.include which is included
at the top of tools/include/nolibc/Makefile.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 tools/include/nolibc/Makefile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index df9304e6d818..56343fdbdb2f 100644
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -17,12 +17,6 @@ endif
 # it defaults to this nolibc directory.
 OUTPUT ?= $(CURDIR)/
 
-ifeq ($(V),1)
-Q=
-else
-Q=@
-endif
-
 arch_files := arch.h $(wildcard arch-*.h)
 all_files := \
 		compiler.h \

-- 
2.53.0

[PATCH 4/4] tools/nolibc: explicitly list architecture headers

[Thomas Weißschuh]

Relying on $(wildcard) is brittle and non-deterministic.

Switch the list of architecture headers to an explicit list,
similar to all the other headers.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 tools/include/nolibc/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index 56343fdbdb2f..cb483128e62a 100644
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -17,7 +17,8 @@ endif
 # it defaults to this nolibc directory.
 OUTPUT ?= $(CURDIR)/
 
-arch_files := arch.h $(wildcard arch-*.h)
+architectures := arm arm64 loongarch m68k mips powerpc riscv s390 sh sparc x86
+arch_files := arch.h $(addsuffix .h, $(addprefix arch-, $(architectures)))
 all_files := \
 		compiler.h \
 		crt.h \

-- 
2.53.0

Re: [PATCH 0/4] tools/nolibc: clean up the Makefile a bit

[Willy Tarreau]

On Wed, Apr 01, 2026 at 05:08:27PM +0200, Thomas Weißschuh wrote:
> The nolibc installation Makefile contains some cruft, clean it up.
> 
> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
> ---
> Thomas Weißschuh (4):
>       tools/nolibc: drop superfluous invocation of 'make headers'
>       tools/nolibc: drop superfluous invocation of mkdir
>       tools/nolibc: drop superfluous definition of Q
>       tools/nolibc: explicitly list architecture headers

All of these do indeed make sense. For the whole series:

Acked-by: Willy Tarreau <w@1wt.eu>

Thanks!
Willy