qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 04/10] meson: perform snappy test with the C++ compiler if used
Date: Mon,  8 Nov 2021 15:36:10 +0100	[thread overview]
Message-ID: <20211108143616.660340-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20211108143616.660340-1-pbonzini@redhat.com>

Snappy is written in C++ and as such needs to link against libstdc++.  When
linking statically, this means that the compile test cannot succeed unless
performed with a C++ compiler.  Do so if link_language is set to C++; if it
is C, the test will usually fail and snappy will be disabled.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 47df10afc2..6bfed294d0 100644
--- a/meson.build
+++ b/meson.build
@@ -197,6 +197,10 @@ add_project_arguments('-iquote', '.',
 link_language = meson.get_external_property('link_language', 'cpp')
 if link_language == 'cpp'
   add_languages('cpp', required: true, native: false)
+  cxx = meson.get_compiler('cpp')
+  linker = cxx
+else
+  linker = cc
 endif
 if host_machine.system() == 'darwin'
   add_languages('objc', required: false, native: false)
@@ -1109,7 +1113,7 @@ if not get_option('snappy').auto() or have_system
                            required: get_option('snappy'),
                            kwargs: static_kwargs)
 endif
-if snappy.found() and not cc.links('''
+if snappy.found() and not linker.links('''
    #include <snappy-c.h>
    int main(void) { snappy_max_compressed_length(4096); return 0; }''', dependencies: snappy)
   snappy = not_found
-- 
2.33.1




  parent reply	other threads:[~2021-11-08 14:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-08 14:36 [PULL 00/10] Misc QEMU bugfixes for 6.2 hard freeze Paolo Bonzini
2021-11-08 14:36 ` [PULL 01/10] target-i386: mmu: use pg_mode instead of HF_LMA_MASK Paolo Bonzini
2021-11-08 14:36 ` [PULL 02/10] target-i386: mmu: fix handling of noncanonical virtual addresses Paolo Bonzini
2021-11-08 14:36 ` [PULL 03/10] hw/scsi/scsi-disk: MODE_PAGE_ALLS not allowed in MODE SELECT commands Paolo Bonzini
2021-11-08 16:23   ` Philippe Mathieu-Daudé
2021-11-08 14:36 ` Paolo Bonzini [this message]
2021-11-08 14:36 ` [PULL 05/10] docs: adjust for demise of scripts/create_config Paolo Bonzini
2021-11-08 14:36 ` [PULL 06/10] configure: simplify calls to meson_quote Paolo Bonzini
2021-11-08 14:36 ` [PULL 07/10] configure: preserve CFLAGS, CXXFLAGS and LDFLAGS in config.status Paolo Bonzini
2021-11-08 14:36 ` [PULL 08/10] configure: propagate --extra-cflags and --extra-ldflags to meson compile tests Paolo Bonzini
2021-11-08 14:36 ` [PULL 09/10] configure: ignore preexisting QEMU_*FLAGS envvars Paolo Bonzini
2021-11-08 14:36 ` [PULL 10/10] ui/gtk-egl: Fix build failure when libgbm is not available Paolo Bonzini
2021-11-08 17:49 ` [PULL 00/10] Misc QEMU bugfixes for 6.2 hard freeze Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211108143616.660340-5-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).