From: Thomas Huth Date: Fri, 27 Aug 2021 12:08:59 +0000 (+0200) Subject: meson.build: Fix the check for a usable libfdt X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=87daf898c7bd67ea205516b53302927a0da70902;p=qemu.git meson.build: Fix the check for a usable libfdt The check for libfdt currently has a flaw: If there is a system libfdt, the meson.build code initialized the fdt variable with fdt = cc.find_library(...). However, if this libfdt is too old and there is no internal dtc module available, it continues with "fdt" pointing to the old and unusable version. The check later in the file that tries to detect whether libfdt is necessary then fails to trigger: if not fdt.found() and fdt_required.length() > 0 error('fdt not available but required by targets ' + ', '.join(fdt_required)) endif The build fails then during compilation instead, which is of course bad since this is quite confusing and already wasted quite some time of the user. Thus if libfdt is not usable, we should unset the "fdt" variable immediately again, so that the build already fails during the configuration phase. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/255 Message-Id: <20210827120901.150276-2-thuth@redhat.com> Reviewed-by: Marc-André Lureau Signed-off-by: Thomas Huth --- diff --git a/meson.build b/meson.build index bf63784812..6f7177428e 100644 --- a/meson.build +++ b/meson.build @@ -1916,6 +1916,7 @@ if have_system fdt_opt = 'internal' else fdt_opt = 'disabled' + fdt = not_found endif endif if fdt_opt == 'internal'