From 4ac4caa2cf2ee617c1b9b53246aa07cb8bf54154 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 27 Sep 2018 17:17:37 +0200 Subject: meson: use the host architecture compiler/linker for src/boot/efi cross building systemd to arm64 presently fails, because the build system uses plain gcc and plain ld (build architecture compiler and linker respectively) for building src/boot/efi. These values come from the efi-cc and efi-ld options respectively. It rather should be using host tools here. Fixes: b710072da441 ("add support for building efi modules") (cherry picked from commit df7cacae696ae3c1d13d2f9a4db24815e07e29a1) --- meson_options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 05f80ba1a..2e5fff6b3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -343,9 +343,9 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], #if 0 /// UNNEEDED BY elogind # option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], # description : 'gnu-efi support for sd-boot') -# option('efi-cc', type : 'string', value : 'gcc', +# option('efi-cc', type : 'string', # description : 'the compiler to use for EFI modules') -# option('efi-ld', type : 'string', value : 'ld', +# 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') -- cgit v1.2.3