shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

meson: use efi-includedir to look for header

Browse Source 
This change mirrors cba49f2dea.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-17 13:22:28 -04:00
parent 3a30f21ff8
commit 0a76b0e8a2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,8 @@ if conf.get('ENABLE_EFI', 0) == 1 and get_option('gnu-efi') != 'false'
efi_cc = get_option('efi-cc') efi_cc = get_option('efi-cc')
efi_ld = get_option('efi-ld') efi_ld = get_option('efi-ld')
efibind_h = 'efi/@0@/efibind.h'.format(efi_arch) efi_incdir = get_option('efi-includedir')
efibind_h = '@0@/@1@/efibind.h'.format(efi_incdir, efi_arch)
have_header = cc.has_header(efibind_h) have_header = cc.has_header(efibind_h)
if have_header and EFI_MACHINE_TYPE_NAME == '' if have_header and EFI_MACHINE_TYPE_NAME == ''
@ -73,8 +74,6 @@ if have_gnu_efi
efi_ldsdir = join_paths(efi_libdir, 'gnuefi') efi_ldsdir = join_paths(efi_libdir, 'gnuefi')
endif endif
efi_incdir = get_option('efi-includedir')
message('efi-libdir: "@0@"'.format(efi_libdir)) message('efi-libdir: "@0@"'.format(efi_libdir))
message('efi-ldsdir: "@0@"'.format(efi_ldsdir)) message('efi-ldsdir: "@0@"'.format(efi_ldsdir))
message('efi-includedir: "@0@"'.format(efi_incdir)) message('efi-includedir: "@0@"'.format(efi_incdir))