Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
meson.build | 5 ++---
system/meson.build | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 71c253ba135..7718983951e 100644
--- a/meson.build
+++ b/meson.build
@@ -4437,14 +4437,14 @@ foreach target : target_dirs
execs = [{
'name': 'qemu-system-' + target_name,
'win_subsystem': 'console',
- 'sources': files('system/main.c'),
+ 'sources': [],
'dependencies': [sdl]
}]
if host_os == 'windows' and (sdl.found() or gtk.found())
execs += [{
'name': 'qemu-system-' + target_name + 'w',
'win_subsystem': 'windows',
- 'sources': files('system/main.c'),
+ 'sources': [],
'dependencies': [sdl]
}]
endif
@@ -4519,7 +4519,6 @@ foreach lib: single_binary_libs
single_binary_objects += lib.extract_all_objects(recursive: true)
endforeach
executable('qemu-system',
- sources: files('system/main.c'),
objects: single_binary_objects,
dependencies: single_binary_deps,
link_depends: [block_syms, qemu_syms],
diff --git a/system/meson.build b/system/meson.build
index 6d21ff9faa7..f358c2c446d 100644
--- a/system/meson.build
+++ b/system/meson.build
@@ -18,6 +18,7 @@ system_ss.add(files(
'globals.c',
'ioport.c',
'ram-block-attributes.c',
+ 'main.c',
'memory_mapping.c',
'memory.c',
'physmem.c',
--
2.47.2
On 7/25/25 10:20, Pierrick Bouvier wrote:
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
> meson.build | 5 ++---
> system/meson.build | 1 +
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 71c253ba135..7718983951e 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -4437,14 +4437,14 @@ foreach target : target_dirs
> execs = [{
> 'name': 'qemu-system-' + target_name,
> 'win_subsystem': 'console',
> - 'sources': files('system/main.c'),
> + 'sources': [],
> 'dependencies': [sdl]
> }]
> if host_os == 'windows' and (sdl.found() or gtk.found())
> execs += [{
> 'name': 'qemu-system-' + target_name + 'w',
> 'win_subsystem': 'windows',
> - 'sources': files('system/main.c'),
> + 'sources': [],
> 'dependencies': [sdl]
> }]
> endif
> @@ -4519,7 +4519,6 @@ foreach lib: single_binary_libs
> single_binary_objects += lib.extract_all_objects(recursive: true)
> endforeach
> executable('qemu-system',
> - sources: files('system/main.c'),
> objects: single_binary_objects,
> dependencies: single_binary_deps,
> link_depends: [block_syms, qemu_syms],
This series depends on stuff not upstream. But anyway,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
On 7/25/25 1:44 PM, Richard Henderson wrote:
> On 7/25/25 10:20, Pierrick Bouvier wrote:
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>> meson.build | 5 ++---
>> system/meson.build | 1 +
>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 71c253ba135..7718983951e 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -4437,14 +4437,14 @@ foreach target : target_dirs
>> execs = [{
>> 'name': 'qemu-system-' + target_name,
>> 'win_subsystem': 'console',
>> - 'sources': files('system/main.c'),
>> + 'sources': [],
>> 'dependencies': [sdl]
>> }]
>> if host_os == 'windows' and (sdl.found() or gtk.found())
>> execs += [{
>> 'name': 'qemu-system-' + target_name + 'w',
>> 'win_subsystem': 'windows',
>> - 'sources': files('system/main.c'),
>> + 'sources': [],
>> 'dependencies': [sdl]
>> }]
>> endif
>> @@ -4519,7 +4519,6 @@ foreach lib: single_binary_libs
>> single_binary_objects += lib.extract_all_objects(recursive: true)
>> endforeach
>> executable('qemu-system',
>> - sources: files('system/main.c'),
>> objects: single_binary_objects,
>> dependencies: single_binary_deps,
>> link_depends: [block_syms, qemu_syms],
>
> This series depends on stuff not upstream. But anyway,
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>
> r~
Oh right, sorry. Depends on the patch adding the single-binary, which we
didn't upstream yet.
I'll hold this one a bit longer.
© 2016 - 2026 Red Hat, Inc.