meson: use efi-includedir to look for header

keszybz · keszybz · commit 0a76b0e8a204 · 2017-04-23T21:47:29.000-04:00
This change mirrors cba49f2.
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
@@ -32,7 +32,8 @@ if conf.get('ENABLE_EFI', 0) == 1 and get_option('gnu-efi') != 'false'
   efi_cc = get_option('efi-cc')
   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)
 
   if have_header and EFI_MACHINE_TYPE_NAME == ''
@@ -73,8 +74,6 @@ if have_gnu_efi
     efi_ldsdir = join_paths(efi_libdir, 'gnuefi')
   endif
 
-  efi_incdir = get_option('efi-includedir')
-
   message('efi-libdir: "@0@"'.format(efi_libdir))
   message('efi-ldsdir: "@0@"'.format(efi_ldsdir))
   message('efi-includedir: "@0@"'.format(efi_incdir))
