mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
tools/nolibc: make the "headers" target install all supported archs
The efforts we go through by installing a single arch are counter productive when the base directory already supports them all, and the arch-specific files are really small. Let's make the "headers" target simply install headers for all supported archs and stop trying to build a hybrid "arch.h" file on the fly, to instead keep the generic one. Now the same nolibc headers installation will be usable with any arch-specific uapi installation. Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
This commit is contained in:
committed by
Thomas Weißschuh
parent
44bf8bbe29
commit
1868c027b6
@@ -23,7 +23,7 @@ else
|
||||
Q=@
|
||||
endif
|
||||
|
||||
arch_file := arch-$(ARCH).h
|
||||
arch_files := arch.h $(wildcard arch-*.h)
|
||||
all_files := \
|
||||
compiler.h \
|
||||
crt.h \
|
||||
@@ -82,7 +82,7 @@ help:
|
||||
@echo "Supported targets under nolibc:"
|
||||
@echo " all call \"headers\""
|
||||
@echo " clean clean the sysroot"
|
||||
@echo " headers prepare a sysroot in \$${OUTPUT}sysroot"
|
||||
@echo " headers prepare a multi-arch sysroot in \$${OUTPUT}sysroot"
|
||||
@echo " headers_standalone like \"headers\", and also install kernel headers"
|
||||
@echo " help this help"
|
||||
@echo ""
|
||||
@@ -93,18 +93,11 @@ help:
|
||||
@echo " OUTPUT = $(OUTPUT)"
|
||||
@echo ""
|
||||
|
||||
# installs headers for all archs at once.
|
||||
headers:
|
||||
$(Q)mkdir -p $(OUTPUT)sysroot
|
||||
$(Q)mkdir -p $(OUTPUT)sysroot/include
|
||||
$(Q)cp --parents $(all_files) $(OUTPUT)sysroot/include/
|
||||
$(Q)if [ "$(ARCH)" = "i386" -o "$(ARCH)" = "x86_64" ]; then \
|
||||
cat arch-x86.h; \
|
||||
elif [ -e "$(arch_file)" ]; then \
|
||||
cat $(arch_file); \
|
||||
else \
|
||||
echo "Fatal: architecture $(ARCH) not yet supported by nolibc." >&2; \
|
||||
exit 1; \
|
||||
fi > $(OUTPUT)sysroot/include/arch.h
|
||||
$(Q)mkdir -p "$(OUTPUT)sysroot"
|
||||
$(Q)mkdir -p "$(OUTPUT)sysroot/include"
|
||||
$(Q)cp --parents $(arch_files) $(all_files) "$(OUTPUT)sysroot/include/"
|
||||
|
||||
headers_standalone: headers
|
||||
$(Q)$(MAKE) -C $(srctree) headers
|
||||
|
||||
Reference in New Issue
Block a user