From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 30 Sep 2018 20:18:43 +0000 (-0400)
Subject: meson: avoid calling the shell to resolve efi_libdir
X-Git-Tag: v240~662^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10220%2Fhead;p=thirdparty%2Fsystemd.git

meson: avoid calling the shell to resolve efi_libdir
---

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index d234743f662..aa897c62a13 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