diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-11-03 09:17:48 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-12-31 09:11:29 +0100 |
| commit | d0cda6f461fd33c5f9b063781c63c1ce5fd3fa3b (patch) | |
| tree | c48bd2a0ab0da96761a6b75cdb66cb1ed36a5090 /qga | |
| parent | cfc1a889e509ffeba6e44cca8ff626751bc4219e (diff) | |
| download | qemu-d0cda6f461fd33c5f9b063781c63c1ce5fd3fa3b.zip qemu-d0cda6f461fd33c5f9b063781c63c1ce5fd3fa3b.tar.gz qemu-d0cda6f461fd33c5f9b063781c63c1ce5fd3fa3b.tar.bz2 | |
configure, meson: rename targetos to host_os
This variable is about the host OS, not the target. It is used a lot
more since the Meson conversion, but the original sin dates back to 2003.
Time to fix it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/meson.build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qga/meson.build b/qga/meson.build index 66c0f1e..1c3d2a3 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -7,7 +7,7 @@ if not have_ga endif have_qga_vss = get_option('qga_vss') \ - .require(targetos == 'windows', + .require(host_os == 'windows', error_message: 'VSS support requires Windows') \ .require('cpp' in all_languages, error_message: 'VSS support requires a C++ compiler') \ @@ -67,7 +67,7 @@ qga_ss.add(files( 'main.c', 'cutils.c', )) -if targetos == 'windows' +if host_os == 'windows' qga_ss.add(files( 'channel-win32.c', 'commands-win32.c', @@ -80,9 +80,9 @@ else 'commands-posix.c', 'commands-posix-ssh.c', )) - if targetos == 'linux' + if host_os == 'linux' qga_ss.add(files('commands-linux.c')) - elif targetos in bsd_oses + elif host_os in bsd_oses qga_ss.add(files('commands-bsd.c')) endif endif @@ -91,7 +91,7 @@ qga_ss = qga_ss.apply({}) gen_tlb = [] qga_libs = [] -if targetos == 'windows' +if host_os == 'windows' qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32', '-lwininet', '-liphlpapi', '-lnetapi32', '-lsetupapi', '-lcfgmgr32'] if have_qga_vss @@ -101,7 +101,7 @@ if targetos == 'windows' endif qga_objs = [] -if targetos == 'windows' +if host_os == 'windows' windmc = find_program('windmc', required: true) windres = find_program('windres', required: true) @@ -123,7 +123,7 @@ qga = executable('qemu-ga', qga_ss.sources() + qga_objs, install: true) all_qga += qga -if targetos == 'windows' +if host_os == 'windows' qemu_ga_msi_arch = { 'x86': ['-D', 'Arch=32'], 'x86_64': ['-a', 'x64', '-D', 'Arch=64'] @@ -185,7 +185,7 @@ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) # the leak detector in build-oss-fuzz Gitlab CI test. we should re-enable # this when an alternative is implemented or when the underlying glib # issue is identified/fix -#if targetos != 'windows' +#if host_os != 'windows' if false srcs = [files('commands-posix-ssh.c')] i = 0 |