From dcb6061e1cc194911a5f36f3a09ff75fc7b951ac Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 22 Mar 2021 20:52:00 +0900 Subject: [PATCH] meson: fix warning about comparison between different types Follow-up for e39288193fcdf3a36dbc49b78e6c9bf86a764e31. --- meson_options.txt | 2 +- src/boot/efi/meson.build | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index bcc0dc11f87..d96d4e3f047 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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') diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index bb5f591fe56..2a37b0a9ac6 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -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