From bb9d2caabecf4cfe5c83cd834479d902c6c84e70 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 30 Sep 2018 16:18:43 -0400 Subject: [PATCH] meson: avoid calling the shell to resolve efi_libdir (cherry picked from commit 5f723125aece111f1990f9ff6d3572fb2509ad19) Gbp-Pq: Name meson-avoid-calling-the-shell-to-resolve-efi_libdir.patch --- src/boot/efi/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 04ca02f1..77b311b2 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -57,10 +57,13 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' efi_libdir = get_option('efi-libdir') if efi_libdir == '' - cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(' '.join(efi_cc)) - ret = run_command('sh', '-c', cmd) + ret = run_command(efi_cc + ['-print-multi-os-directory']) if ret.returncode() == 0 - efi_libdir = ret.stdout().strip() + path = join_paths('/usr/lib', ret.stdout().strip()) + ret = run_command('realpath', '-e', path) + if ret.returncode() == 0 + efi_libdir = ret.stdout().strip() + endif endif endif -- 2.30.2