From f67b2880fc2cfb21f51216c63b5f24d0524b4278 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 19 Oct 2022 10:54:50 +0800 Subject: [PATCH] grub: disable build on armv7ve/a with hardfp The commit(75dbdea940 grub: Allow build on armv7ve/a with softfp) enable build on armv7ve/a with softfp, but it acutally enable build on armv7ve/a with hardfp altogether and result in below build failure: | checking for compile options to get strict alignment... -mno-unaligned-access | checking if compiler generates unaligned accesses... no | checking if C symbols get an underscore after compilation... no | checking whether target compiler is working... no | configure: error: cannot compile for the target So update the check to disable build on armv7ve/a with hardfp. Signed-off-by: Mingli Yu Signed-off-by: Alexandre Belloni --- meta/recipes-bsp/grub/grub2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 2545b99b6a3..7161c4560b0 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -50,8 +50,8 @@ COMPATIBLE_HOST = "${GRUB_COMPATIBLE_HOST}" # Grub doesn't support hard float toolchain and won't be able to forcefully # disable it on some of the target CPUs. See 'configure.ac' for # supported/unsupported CPUs in hardfp. -COMPATIBLE_HOST:armv7a = "${@'null' if d.getVar('TUNE_CCARGS_MFLOAT') == 'hardfp' else d.getVar('GRUB_COMPATIBLE_HOST')}" -COMPATIBLE_HOST:armv7ve = "${@'null' if d.getVar('TUNE_CCARGS_MFLOAT') == 'hardfp' else d.getVar('GRUB_COMPATIBLE_HOST')}" +COMPATIBLE_HOST:armv7a = "${@'null' if bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', True, False, d) else d.getVar('GRUB_COMPATIBLE_HOST')}" +COMPATIBLE_HOST:armv7ve = "${@'null' if bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', True, False, d) else d.getVar('GRUB_COMPATIBLE_HOST')}" # configure.ac has code to set this automagically from the target tuple # but the OE freeform one (core2-foo-bar-linux) don't work with that. -- 2.47.3