aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2018-09-27 17:17:37 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-09-28 14:42:56 +0200
commitdf7cacae696ae3c1d13d2f9a4db24815e07e29a1 (patch)
treed49d524241c5112355e2948a3a8a31f7c08b03b4 /meson_options.txt
parentMerge pull request #10186 from yuwata/fix-10149 (diff)
downloadsystemd-df7cacae696ae3c1d13d2f9a4db24815e07e29a1.tar.gz
systemd-df7cacae696ae3c1d13d2f9a4db24815e07e29a1.tar.bz2
systemd-df7cacae696ae3c1d13d2f9a4db24815e07e29a1.zip
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")
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt
index 7b1f61bf4..92e8fadcc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -278,9 +278,9 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'],
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')