diff options
| author | Jan Janssen <medhefgo@web.de> | 2021-11-02 10:47:41 +0100 |
|---|---|---|
| committer | Jan Janssen <medhefgo@web.de> | 2021-11-04 18:54:31 +0100 |
| commit | d1da89000467387c90967558f481235dc66f347c (patch) | |
| tree | 342ac0025e335373c7cad393eefb4ad7204e6a9d /src/boot | |
| parent | 1840dfc327805dbc7b8f729e090c129019b08cca (diff) | |
| download | systemd-d1da89000467387c90967558f481235dc66f347c.tar.gz | |
sd-boot: Fix efi_arch checks
efi_arch is set to whatever meson returns from host_machine.cpu_family() and
gnu_efi_arch is then set accordingly.
On x86, efi_arch == x86 and gnu_efi_arch == ia32. Surprisingly, compilation
worked (without disabling some instruction sets) and nobody ever complained
about systemd-bootia32.efi not working.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/efi/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index a0f9243b5b..40b0ab0dbd 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -45,7 +45,7 @@ stub_sources = ''' cpio.c '''.split() -if ['ia32', 'x86_64'].contains(efi_arch) +if efi_arch in ['x86', 'x86_64'] stub_sources += 'linux_x86.c' else stub_sources += 'linux.c' @@ -229,7 +229,7 @@ if have_gnu_efi compile_args += ['-mno-red-zone', '-mno-sse', '-mno-mmx'] - elif efi_arch == 'ia32' + elif efi_arch == 'x86' compile_args += ['-mno-sse', '-mno-mmx'] elif efi_arch == 'arm' |