meson: clean up build_by_default
Build all executables by default except for the known-broken ones. This also allows running qemu-iotests without manually building socket_scm_helper. Reported-by: Max Reitz <mreitz@redhat.com> Tested-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
8a5701e54a
commit
27d551c00d
|
@ -193,6 +193,11 @@ compilation as possible. The Meson "sourceset" functionality is used
|
||||||
to list the files and their dependency on various configuration
|
to list the files and their dependency on various configuration
|
||||||
symbols.
|
symbols.
|
||||||
|
|
||||||
|
All executables are built by default, except for some `contrib/`
|
||||||
|
binaries that are known to fail to build on some platforms (for example
|
||||||
|
32-bit or big-endian platforms). Tests are also built by default,
|
||||||
|
though that might change in the future.
|
||||||
|
|
||||||
Various subsystems that are common to both tools and emulators have
|
Various subsystems that are common to both tools and emulators have
|
||||||
their own sourceset, for example `block_ss` for the block device subsystem,
|
their own sourceset, for example `block_ss` for the block device subsystem,
|
||||||
`chardev_ss` for the character device subsystem, etc. These sourcesets
|
`chardev_ss` for the character device subsystem, etc. These sourcesets
|
||||||
|
|
|
@ -541,7 +541,6 @@ fpcflags += [
|
||||||
fptest = executable(
|
fptest = executable(
|
||||||
'fp-test',
|
'fp-test',
|
||||||
['fp-test.c', tfdir / 'slowfloat.c', '../../fpu/softfloat.c'],
|
['fp-test.c', tfdir / 'slowfloat.c', '../../fpu/softfloat.c'],
|
||||||
build_by_default: false,
|
|
||||||
link_with: [libtestfloat, libsoftfloat],
|
link_with: [libtestfloat, libsoftfloat],
|
||||||
dependencies: [qemuutil],
|
dependencies: [qemuutil],
|
||||||
include_directories: [sfinc, include_directories(tfdir)],
|
include_directories: [sfinc, include_directories(tfdir)],
|
||||||
|
@ -628,7 +627,6 @@ test('fp-test:mulAdd', fptest,
|
||||||
fpbench = executable(
|
fpbench = executable(
|
||||||
'fp-bench',
|
'fp-bench',
|
||||||
['fp-bench.c', '../../fpu/softfloat.c'],
|
['fp-bench.c', '../../fpu/softfloat.c'],
|
||||||
build_by_default: false,
|
|
||||||
link_with: [libtestfloat, libsoftfloat],
|
link_with: [libtestfloat, libsoftfloat],
|
||||||
dependencies: [qemuutil],
|
dependencies: [qemuutil],
|
||||||
include_directories: [sfinc, include_directories(tfdir)],
|
include_directories: [sfinc, include_directories(tfdir)],
|
||||||
|
|
|
@ -251,12 +251,11 @@ foreach bench_name, deps: benchs
|
||||||
suite: ['speed'])
|
suite: ['speed'])
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
if have_tools and 'CONFIG_VHOST_USER' in config_host
|
if have_tools and 'CONFIG_VHOST_USER' in config_host and 'CONFIG_LINUX' in config_host
|
||||||
executable('vhost-user-bridge',
|
executable('vhost-user-bridge',
|
||||||
sources: files('vhost-user-bridge.c'),
|
sources: files('vhost-user-bridge.c'),
|
||||||
link_with: [libvhost_user],
|
link_with: [libvhost_user],
|
||||||
dependencies: [qemuutil],
|
dependencies: [qemuutil])
|
||||||
build_by_default: false)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if have_system and 'CONFIG_POSIX' in config_host
|
if have_system and 'CONFIG_POSIX' in config_host
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
if 'CONFIG_LINUX' in config_host
|
if 'CONFIG_LINUX' in config_host
|
||||||
socket_scm_helper = executable('socket_scm_helper', 'socket_scm_helper.c',
|
socket_scm_helper = executable('socket_scm_helper', 'socket_scm_helper.c')
|
||||||
build_by_default: false)
|
|
||||||
else
|
else
|
||||||
socket_scm_helper = []
|
socket_scm_helper = []
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -70,7 +70,6 @@ foreach d : [
|
||||||
output: d[0],
|
output: d[0],
|
||||||
input: meson.source_root() / 'trace-events',
|
input: meson.source_root() / 'trace-events',
|
||||||
command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ],
|
command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ],
|
||||||
build_by_default: true, # to be removed when added to a target
|
|
||||||
capture: true)
|
capture: true)
|
||||||
specific_ss.add(gen)
|
specific_ss.add(gen)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
|
@ -9,7 +9,6 @@ foreach e : shaders
|
||||||
genh += custom_target(output,
|
genh += custom_target(output,
|
||||||
output: output,
|
output: output,
|
||||||
capture: true,
|
capture: true,
|
||||||
build_by_default: true, # to be removed when added to a target
|
|
||||||
input: files('@0@.@1@'.format(e[0], e[1])),
|
input: files('@0@.@1@'.format(e[0], e[1])),
|
||||||
command: [shaderinclude, '@INPUT0@'])
|
command: [shaderinclude, '@INPUT0@'])
|
||||||
endforeach
|
endforeach
|
||||||
|
|
Loading…
Reference in New Issue