mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-30 13:31:52 -06:00
meson: do not check supported TCG architecture if no emulators built
Errors about TCI are pointless if only tools are being built; suppress them even if the user did not specify --disable-tcg. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
5346686182
commit
e3c426cb78
3 changed files with 8 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
||||||
if not get_option('tcg').allowed()
|
if not have_tcg
|
||||||
subdir_done()
|
subdir_done()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
10
meson.build
10
meson.build
|
@ -247,6 +247,8 @@ have_vhost_net_vdpa = have_vhost_vdpa and get_option('vhost_net').allowed()
|
||||||
have_vhost_net_kernel = have_vhost_kernel and get_option('vhost_net').allowed()
|
have_vhost_net_kernel = have_vhost_kernel and get_option('vhost_net').allowed()
|
||||||
have_vhost_net = have_vhost_net_kernel or have_vhost_net_user or have_vhost_net_vdpa
|
have_vhost_net = have_vhost_net_kernel or have_vhost_net_user or have_vhost_net_vdpa
|
||||||
|
|
||||||
|
have_tcg = get_option('tcg').allowed() and (have_system or have_user)
|
||||||
|
|
||||||
have_tools = get_option('tools') \
|
have_tools = get_option('tools') \
|
||||||
.disable_auto_if(not have_system) \
|
.disable_auto_if(not have_system) \
|
||||||
.allowed()
|
.allowed()
|
||||||
|
@ -863,7 +865,7 @@ elif host_os == 'haiku'
|
||||||
cc.find_library('network'),
|
cc.find_library('network'),
|
||||||
cc.find_library('bsd')]
|
cc.find_library('bsd')]
|
||||||
elif host_os == 'openbsd'
|
elif host_os == 'openbsd'
|
||||||
if get_option('tcg').allowed() and target_dirs.length() > 0
|
if have_tcg
|
||||||
# Disable OpenBSD W^X if available
|
# Disable OpenBSD W^X if available
|
||||||
emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded')
|
emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded')
|
||||||
endif
|
endif
|
||||||
|
@ -904,7 +906,7 @@ if host_os == 'netbsd'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
tcg_arch = host_arch
|
tcg_arch = host_arch
|
||||||
if get_option('tcg').allowed()
|
if have_tcg
|
||||||
if host_arch == 'unknown'
|
if host_arch == 'unknown'
|
||||||
if not get_option('tcg_interpreter')
|
if not get_option('tcg_interpreter')
|
||||||
error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu))
|
error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu))
|
||||||
|
@ -2534,7 +2536,7 @@ config_host_data.set('CONFIG_PIXMAN', pixman.found())
|
||||||
config_host_data.set('CONFIG_SLIRP', slirp.found())
|
config_host_data.set('CONFIG_SLIRP', slirp.found())
|
||||||
config_host_data.set('CONFIG_SNAPPY', snappy.found())
|
config_host_data.set('CONFIG_SNAPPY', snappy.found())
|
||||||
config_host_data.set('CONFIG_SOLARIS', host_os == 'sunos')
|
config_host_data.set('CONFIG_SOLARIS', host_os == 'sunos')
|
||||||
if get_option('tcg').allowed()
|
if have_tcg
|
||||||
config_host_data.set('CONFIG_TCG', 1)
|
config_host_data.set('CONFIG_TCG', 1)
|
||||||
config_host_data.set('CONFIG_TCG_INTERPRETER', tcg_arch == 'tci')
|
config_host_data.set('CONFIG_TCG_INTERPRETER', tcg_arch == 'tci')
|
||||||
endif
|
endif
|
||||||
|
@ -4959,7 +4961,7 @@ if host_arch == 'unknown'
|
||||||
message('compile or work on this host CPU. You can help by volunteering')
|
message('compile or work on this host CPU. You can help by volunteering')
|
||||||
message('to maintain it and providing a build host for our continuous')
|
message('to maintain it and providing a build host for our continuous')
|
||||||
message('integration setup.')
|
message('integration setup.')
|
||||||
if get_option('tcg').allowed() and target_dirs.length() > 0
|
if have_tcg
|
||||||
message()
|
message()
|
||||||
message('configure has succeeded and you can continue to build, but')
|
message('configure has succeeded and you can continue to build, but')
|
||||||
message('QEMU will use a slow interpreter to emulate the target CPU.')
|
message('QEMU will use a slow interpreter to emulate the target CPU.')
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if not get_option('tcg').allowed()
|
if not have_tcg
|
||||||
subdir_done()
|
subdir_done()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue