26 lines
839 B
Diff
26 lines
839 B
Diff
From b077524848816638fc7d0cf3e65c062da095626f Mon Sep 17 00:00:00 2001
|
|
From: Jan Janssen <medhefgo@web.de>
|
|
Date: Wed, 29 Dec 2021 15:13:35 +0100
|
|
Subject: [PATCH] meson: Get objcopy location from compiler
|
|
|
|
(cherry picked from commit 2f2b07226751827303a88f3a301f2d834f3fb97b)
|
|
|
|
Related: #2017035
|
|
---
|
|
src/boot/efi/meson.build | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
|
|
index 11e6bf2dd0..144fbb0f43 100644
|
|
--- a/src/boot/efi/meson.build
|
|
+++ b/src/boot/efi/meson.build
|
|
@@ -43,7 +43,7 @@ if not cc.has_header_symbol('efi.h', 'EFI_IMAGE_MACHINE_X64',
|
|
subdir_done()
|
|
endif
|
|
|
|
-objcopy = find_program('objcopy')
|
|
+objcopy = run_command(cc.cmd_array(), '-print-prog-name=objcopy', check: true).stdout().strip()
|
|
|
|
efi_ld = get_option('efi-ld')
|
|
if efi_ld == 'auto'
|