From f8cafe1a70e0cee064610397af45dd7815f74c48 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 2 Sep 2024 07:20:17 +0000 Subject: [PATCH] sys-boot/gnu-efi: Sync with Gentoo It's from Gentoo commit a786643b846ca4f1c12121f3a3a82b47229e8c25. --- .../sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild index b34d3a74c7..7185e2dbb7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild @@ -42,7 +42,7 @@ check_and_set_objcopy() { # llvm-objcopy does not support EFI target, try to use binutils objcopy or fail tc-export OBJCOPY OBJCOPY="${OBJCOPY/llvm-/}" - LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\ /dev/null | grep ^install: | cut -f2 -d' ')/include + CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include elif tc-is-clang; then - CPPINCLUDEDIR=$(LANG=C ${CC} -print-resource-dir 2> /dev/null)/include + CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include fi append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include"