summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-17 13:22:28 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-23 21:47:29 -0400
commit0a76b0e8a2043936b6dd598a7a3f924bd683eec8 (patch)
tree9e4244f9b7252e057f096abeac26ac2a391a4eb7
parent3a30f21ff8ddbef5eae61d6e4305ec1cd2e4e041 (diff)
downloadsystemd-0a76b0e8a2043936b6dd598a7a3f924bd683eec8.tar.gz
meson: use efi-includedir to look for header
This change mirrors cba49f2deab481045408d5452ac8c84fc03bccd5.
-rw-r--r--src/boot/efi/meson.build5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 2a69bc5c25..059cc7be31 100644
--- 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))