mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-22 10:55:31 +00:00
meson: clean up static_library keyword arguments
These are either built because they are dependencies of other targets, or not needed at all because they are used via extract_objects(). Mark them as "build_by_default: false"; if applicable, mark them as "fa" so that -Wl,--whole-archive does not interact with the linker script used for fuzzing. (The "fa" hack is brittle; updating to Meson 1.1 would allow using declare_dependency(objects: ...) instead). Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1044 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
f0df613b98
commit
4c545a05ab
|
@ -21,12 +21,12 @@ libgdb_user = static_library('gdb_user',
|
||||||
gdb_user_ss.sources() + genh,
|
gdb_user_ss.sources() + genh,
|
||||||
name_suffix: 'fa',
|
name_suffix: 'fa',
|
||||||
c_args: '-DCONFIG_USER_ONLY',
|
c_args: '-DCONFIG_USER_ONLY',
|
||||||
build_by_default: have_user)
|
build_by_default: false)
|
||||||
|
|
||||||
libgdb_softmmu = static_library('gdb_softmmu',
|
libgdb_softmmu = static_library('gdb_softmmu',
|
||||||
gdb_system_ss.sources() + genh,
|
gdb_system_ss.sources() + genh,
|
||||||
name_suffix: 'fa',
|
name_suffix: 'fa',
|
||||||
build_by_default: have_system)
|
build_by_default: false)
|
||||||
|
|
||||||
gdb_user = declare_dependency(link_whole: libgdb_user)
|
gdb_user = declare_dependency(link_whole: libgdb_user)
|
||||||
user_ss.add(gdb_user)
|
user_ss.add(gdb_user)
|
||||||
|
|
11
meson.build
11
meson.build
|
@ -3180,7 +3180,6 @@ foreach d : hx_headers
|
||||||
input: files(d[0]),
|
input: files(d[0]),
|
||||||
output: d[1],
|
output: d[1],
|
||||||
capture: true,
|
capture: true,
|
||||||
build_by_default: true, # to be removed when added to a target
|
|
||||||
command: [hxtool, '-h', '@INPUT0@'])
|
command: [hxtool, '-h', '@INPUT0@'])
|
||||||
endforeach
|
endforeach
|
||||||
genh += hxdep
|
genh += hxdep
|
||||||
|
@ -3366,12 +3365,15 @@ endif
|
||||||
qom_ss = qom_ss.apply(config_targetos, strict: false)
|
qom_ss = qom_ss.apply(config_targetos, strict: false)
|
||||||
libqom = static_library('qom', qom_ss.sources() + genh,
|
libqom = static_library('qom', qom_ss.sources() + genh,
|
||||||
dependencies: [qom_ss.dependencies()],
|
dependencies: [qom_ss.dependencies()],
|
||||||
name_suffix: 'fa')
|
name_suffix: 'fa',
|
||||||
|
build_by_default: false)
|
||||||
qom = declare_dependency(link_whole: libqom)
|
qom = declare_dependency(link_whole: libqom)
|
||||||
|
|
||||||
event_loop_base = files('event-loop-base.c')
|
event_loop_base = files('event-loop-base.c')
|
||||||
event_loop_base = static_library('event-loop-base', sources: event_loop_base + genh,
|
event_loop_base = static_library('event-loop-base',
|
||||||
build_by_default: true)
|
sources: event_loop_base + genh,
|
||||||
|
name_suffix: 'fa',
|
||||||
|
build_by_default: false)
|
||||||
event_loop_base = declare_dependency(link_whole: event_loop_base,
|
event_loop_base = declare_dependency(link_whole: event_loop_base,
|
||||||
dependencies: [qom])
|
dependencies: [qom])
|
||||||
|
|
||||||
|
@ -3380,6 +3382,7 @@ stub_ss = stub_ss.apply(config_all, strict: false)
|
||||||
util_ss.add_all(trace_ss)
|
util_ss.add_all(trace_ss)
|
||||||
util_ss = util_ss.apply(config_all, strict: false)
|
util_ss = util_ss.apply(config_all, strict: false)
|
||||||
libqemuutil = static_library('qemuutil',
|
libqemuutil = static_library('qemuutil',
|
||||||
|
build_by_default: false,
|
||||||
sources: util_ss.sources() + stub_ss.sources() + genh,
|
sources: util_ss.sources() + stub_ss.sources() + genh,
|
||||||
dependencies: [util_ss.dependencies(), libm, threads, glib, socket, malloc, pixman])
|
dependencies: [util_ss.dependencies(), libm, threads, glib, socket, malloc, pixman])
|
||||||
qemuutil = declare_dependency(link_with: libqemuutil,
|
qemuutil = declare_dependency(link_with: libqemuutil,
|
||||||
|
|
|
@ -28,7 +28,7 @@ libtcg_user = static_library('tcg_user',
|
||||||
tcg_ss.sources() + genh,
|
tcg_ss.sources() + genh,
|
||||||
name_suffix: 'fa',
|
name_suffix: 'fa',
|
||||||
c_args: '-DCONFIG_USER_ONLY',
|
c_args: '-DCONFIG_USER_ONLY',
|
||||||
build_by_default: have_user)
|
build_by_default: false)
|
||||||
|
|
||||||
tcg_user = declare_dependency(link_with: libtcg_user,
|
tcg_user = declare_dependency(link_with: libtcg_user,
|
||||||
dependencies: tcg_ss.dependencies())
|
dependencies: tcg_ss.dependencies())
|
||||||
|
@ -38,7 +38,7 @@ libtcg_softmmu = static_library('tcg_softmmu',
|
||||||
tcg_ss.sources() + genh,
|
tcg_ss.sources() + genh,
|
||||||
name_suffix: 'fa',
|
name_suffix: 'fa',
|
||||||
c_args: '-DCONFIG_SOFTMMU',
|
c_args: '-DCONFIG_SOFTMMU',
|
||||||
build_by_default: have_system)
|
build_by_default: false)
|
||||||
|
|
||||||
tcg_softmmu = declare_dependency(link_with: libtcg_softmmu,
|
tcg_softmmu = declare_dependency(link_with: libtcg_softmmu,
|
||||||
dependencies: tcg_ss.dependencies())
|
dependencies: tcg_ss.dependencies())
|
||||||
|
|
Loading…
Reference in a new issue