From: Maximilian Engelhardt Date: Tue, 21 Jan 2025 08:17:58 +0000 (+0100) Subject: xen/arch/x86: make objdump output user locale agnostic X-Git-Tag: RELEASE-4.19.2~73 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d260f797843417e65c4d035198f7a171b0dfa1f1;p=xen.git xen/arch/x86: make objdump output user locale agnostic 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 Acked-by: Andrew Cooper master commit: 0d729221ab74c5d2571e71501dc63838acbf752a master date: 2024-12-30 21:40:37 +0000 --- diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index a683d4bedc..b88d097a84 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -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 := :