diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-02-03 20:38:54 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-02-04 23:43:21 +0900 |
| commit | ce4121c6ff92c1c368874bd451b73fa9b1ddec4a (patch) | |
| tree | 91bda61360ea3fb12b18c13c6882f4113a8dce1a /meson_options.txt | |
| parent | 91e50467f5ce8119efc47e5c5637710b9d7f012c (diff) | |
| download | systemd-ce4121c6ff92c1c368874bd451b73fa9b1ddec4a.tar.gz | |
meson: update efi path detection to gnu-efi-3.0.11
Fixes systemd build in Fedora rawhide.
The old ldsdir option is not useful, because both the directory and the
file name changed. Let's remove the option and try to autodetect the file
name. If this turns out to be not enough, a new option to simply specify
the full path to the file can be added.
F31:
efi arch: x86_64
EFI machine type: x64
EFI CC ccache cc
EFI lds: /usr/lib64/gnuefi/elf_x64_efi.lds
EFI crt0: /usr/lib64/gnuefi/crt0-efi-x64.o
EFI include directory: /usr/include/efi
F32:
efi arch: x86_64
EFI machine type: x64
EFI CC ccache cc
EFI lds: /usr/lib/gnuefi/x64/efi.lds
EFI crt0: /usr/lib/gnuefi/x64/crt0.o
EFI include directory: /usr/include/efi
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt index d5b6f24344..4f82479a9b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -323,8 +323,6 @@ option('efi-ld', type : 'string', description : 'the linker to use for EFI modules') option('efi-libdir', type : 'string', description : 'path to the EFI lib directory') -option('efi-ldsdir', type : 'string', - description : 'path to the EFI lds directory') option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory') option('tpm-pcrindex', type : 'integer', value : 8, |