picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: avoid calling the shell to resolve efi_libdir

This commit is contained in:
Mike Gilbert 2018-09-30 16:18:43 -04:00
parent 595343fb4c
commit 5f723125ae
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/boot/efi/meson.build
View File

@ -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