aboutsummaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-05-18 17:29:04 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-05-26 12:34:17 +0200
commit577bdbcf85d4c491da3271d99526b66c576d90e5 (patch)
treed538cc91f3f418a39a78c0895b503b97eed0a600 /meson.build
parent0bfd14149b248e8097ea4da1f9d53beb5c5b0cca (diff)
downloadqemu-577bdbcf85d4c491da3271d99526b66c576d90e5.zip
qemu-577bdbcf85d4c491da3271d99526b66c576d90e5.tar.gz
qemu-577bdbcf85d4c491da3271d99526b66c576d90e5.tar.bz2
meson: simplify logic for -Dfdt
fdt_opt == 'disabled' is going to give an error if libfdt is required by any target, so catch that immediately. For fdt_opt == 'enabled', instead, do not check immediately whether the internal libfdt is present. Instead do the check after ascertaining that libfdt is absent or too old. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build29
1 files changed, 16 insertions, 13 deletions
diff --git a/meson.build b/meson.build
index ee1b7da..2184288 100644
--- a/meson.build
+++ b/meson.build
@@ -3059,13 +3059,14 @@ if have_system and vfio_user_server_allowed
endif
fdt = not_found
-if have_system
- fdt_opt = get_option('fdt')
+fdt_opt = get_option('fdt')
+if fdt_required.length() > 0 or fdt_opt == 'enabled'
+ if fdt_opt == 'disabled'
+ error('fdt disabled but required by targets ' + ', '.join(fdt_required))
+ endif
+
if fdt_opt in ['enabled', 'auto', 'system']
- have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt')
- fdt = cc.find_library('fdt',
- required: fdt_opt == 'system' or
- fdt_opt == 'enabled' and not have_internal)
+ fdt = cc.find_library('fdt', required: fdt_opt == 'system')
if fdt.found() and cc.links('''
#include <libfdt.h>
#include <libfdt_env.h>
@@ -3074,14 +3075,19 @@ if have_system
fdt_opt = 'system'
elif fdt_opt == 'system'
error('system libfdt requested, but it is too old (1.5.1 or newer required)')
- elif have_internal
- fdt_opt = 'internal'
else
- fdt_opt = 'disabled'
+ fdt_opt = 'internal'
fdt = not_found
endif
endif
- if fdt_opt == 'internal'
+ if not fdt.found()
+ assert(fdt_opt == 'internal')
+ have_internal = fs.exists(meson.current_source_dir() / 'subprojects/dtc/meson.build')
+
+ if not have_internal
+ error('libfdt source not found - please pull git submodule')
+ endif
+
fdt_files = files(
'dtc/libfdt/fdt.c',
'dtc/libfdt/fdt_ro.c',
@@ -3106,9 +3112,6 @@ if have_system
else
fdt_opt = 'disabled'
endif
-if not fdt.found() and fdt_required.length() > 0
- error('fdt not available but required by targets ' + ', '.join(fdt_required))
-endif
config_host_data.set('CONFIG_CAPSTONE', capstone.found())
config_host_data.set('CONFIG_FDT', fdt.found())