shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

meson: fix warning about comparison between different types

Browse Source 
Follow-up for e39288193fcdf3a36dbc49b78e6c9bf86a764e31.
This commit is contained in:
Yu Watanabe 2021-03-22 20:52:00 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 17e9000164
commit dcb6061e1c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson_options.txt
View File

@ -362,7 +362,7 @@ option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'gnu-efi support for sd-boot')
option('efi-cc', type : 'array',
description : 'the compiler to use for EFI modules')
option('efi-ld', type : 'string',
option('efi-ld', type : 'string', value : 'ld',
description : 'the linker to use for EFI modules')
option('efi-libdir', type : 'string',
description : 'path to the EFI lib directory')

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

@ -45,14 +45,12 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
if efi_cc.length() == 0
efi_cc = cc.cmd_array()
endif
efi_ld = get_option('efi-ld').to_lower()
if efi_ld == ''
efi_ld = find_program('ld', required: true)
endif
if efi_ld == 'lld' or efi_ld == 'ld.lld'
# LLVM/LLD does not support PE/COFF relocations
# https://lists.llvm.org/pipermail/llvm-dev/2021-March/149234.html
efi_ld = find_program(get_option('efi-ld'), required: true)
efi_ld_name = efi_ld.path().split('/')[-1]
if efi_ld_name == 'lld' or efi_ld_name == 'ld.lld'
# LLVM/LLD does not support PE/COFF relocations
# https://lists.llvm.org/pipermail/llvm-dev/2021-March/149234.html
error('LLVM/lld does not support PE/COFF relocations. Use different linker for EFI image.')
endif