sys-boot/gnu-efi: Fix compile when LLVM binutils-plugin USE flag is set

LLVM's objcopy is being used instead of the GNU version when `binutils-plugin`
is enabled. I tried to avoid this by explictly using the GNU path for objcopy
when our initial test fails.

Let me know if this isn't acceptable, or if you need me to open a new bug
for this. It was basically the same repo as the linked issue, but the fix did
not work, as `which objcopy` returns '/usr/lib/llvm/18/bin/objcopy' instead of
'/usr/bin/objcopy'.

Bug: https://bugs.gentoo.org/931792
Signed-off-by: Maide <github@maide.ca>
Closes: https://github.com/gentoo/gentoo/pull/38785
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
This commit is contained in:
Maide
2024-09-27 20:07:21 +03:00
committed by Viorel Munteanu
parent ac2f5ccf55
commit d25b3f6cfc
2 changed files with 20 additions and 0 deletions
+10
View File
@@ -42,6 +42,16 @@ check_and_set_objcopy() {
# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
tc-export OBJCOPY
OBJCOPY="${OBJCOPY/llvm-/}"
# Test OBJCOPY to see if it supports EFI targets, and return if it does
LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0
# If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is
# still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the
# '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if
# so, we use the absolute path explicitly.
local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}"
if [[ -e "${binutils_objcopy}" ]]; then
OBJCOPY="${binutils_objcopy}"
fi
LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
fi
}
+10
View File
@@ -42,6 +42,16 @@ check_and_set_objcopy() {
# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
tc-export OBJCOPY
OBJCOPY="${OBJCOPY/llvm-/}"
# Test OBJCOPY to see if it supports EFI targets, and return if it does
LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0
# If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is
# still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the
# '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if
# so, we use the absolute path explicitly.
local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}"
if [[ -e "${binutils_objcopy}" ]]; then
OBJCOPY="${binutils_objcopy}"
fi
if ! use arm && ! use riscv; then
# bug #939338
# objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le