From: Jan Beulich Date: Tue, 29 Apr 2025 09:42:47 +0000 (+0200) Subject: include: sort $(wildcard ...) results X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f1dd95598852d5d227aff19b0f90e7194486b6e5;p=xen.git include: sort $(wildcard ...) results The order of items is stored in .*.chk.cmd, and hence variations between how items are ordered would result in re-invocation of the checking rule during "make install-xen" despite that already having successfully run earlier on. The difference can become noticable when building (as non- root) and installing (as root) use different GNU make versions: In 3.82 the sorting was deliberately undone, just for it to be restored in 4.3. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: ff835bbc8096a14ed1bffa235e25848c993f7240 master date: 2025-04-10 10:56:29 +0200 --- diff --git a/xen/include/Makefile b/xen/include/Makefile index 058b0a566b..41b985f4d1 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -41,8 +41,8 @@ cppflags-$(CONFIG_X86) += -m32 endif -public-$(CONFIG_X86) := $(wildcard $(srcdir)/public/arch-x86/*.h $(srcdir)/public/arch-x86/*/*.h) -public-$(CONFIG_ARM) := $(wildcard $(srcdir)/public/arch-arm/*.h $(srcdir)/public/arch-arm/*/*.h) +public-$(CONFIG_X86) := $(sort $(wildcard $(srcdir)/public/arch-x86/*.h $(srcdir)/public/arch-x86/*/*.h)) +public-$(CONFIG_ARM) := $(sort $(wildcard $(srcdir)/public/arch-arm/*.h $(srcdir)/public/arch-arm/*/*.h)) .PHONY: all all: $(addprefix $(obj)/,$(headers-y) $(headers-n)) @@ -130,7 +130,7 @@ all: $(obj)/headers.chk $(obj)/headers99.chk $(obj)/headers++.chk public-hdrs-path := $(srcdir)/public -public-list-headers = $(wildcard $1/*.h $1/*/*.h) +public-list-headers = $(sort $(wildcard $1/*.h $1/*/*.h)) public-filter-headers = $(filter-out $(addprefix $(public-hdrs-path)/, $($1-filter)), $($1)) public-headers := $(call public-list-headers, $(public-hdrs-path)) $(public-y)