richardphibel / rpms / systemd

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