]> xenbits.xensource.com Git - xen.git/commitdiff
xen/arch/x86: make objdump output user locale agnostic
authorMaximilian Engelhardt <maxi@daemonizer.de>
Tue, 21 Jan 2025 08:17:58 +0000 (09:17 +0100)
committerJan Beulich <jbeulich@suse.com>
Tue, 21 Jan 2025 08:17:58 +0000 (09:17 +0100)
The objdump output is fed to grep, so make sure it doesn't change with
different user locales and break the grep parsing.
This problem was identified while updating xen in Debian and the fix is
needed for generating reproducible builds in varying environments.

Signed-off-by: Maximilian Engelhardt <maxi@daemonizer.de>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 0d729221ab74c5d2571e71501dc63838acbf752a
master date: 2024-12-30 21:40:37 +0000

xen/arch/x86/arch.mk

index a683d4bedc5278bbb7931254cfcdfd0b8abb1b8e..b88d097a844b475f24a898746d6c50afb95a3548 100644 (file)
@@ -111,7 +111,7 @@ endif
 ifeq ($(XEN_BUILD_PE),y)
 
 # Check if the linker produces fixups in PE by default
-efi-nr-fixups := $(shell $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)
+efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)
 
 ifeq ($(efi-nr-fixups),2)
 MKRELOC := :