From nobody Sun Nov 16 07:44:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052450; cv=none; d=zohomail.com; s=zohoarc; b=dbsTEuzPB+Z6I3yeLng10+OMStBmzgWpehsllxwXEu2ymk2axXaUHSRdV55YW6pnbn3naBVGM/FA57BDeYVjkcIOLRFoaqvPudN7HtTfUhGm5UZaQbjd1tNxmtHw8zRa2UV/m5n9UVUuoPiw/iVCW+JU9xp786mrHd+TkfyrdOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052450; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oRgWFwPCsjiXsgvA8dt9YmKQcm3JhszpEXfGbn5juR0=; b=IN77G4HRtdyXjElr8EhCLyCO0SF6g3BmxtsXUt8oWDYDPthYcSqINWl67SuXewsQCNn46pwWDJRmOUKsq2sr1IQgtg6m7gJ5SMn5HNhcaftZbonIe33oluW8tp1kW5Nkj6g/2B2c+vZ7l3gJZZXWf+raVVaJR4yEYzF5A6RpGv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599052450390537.0533285871426; Wed, 2 Sep 2020 06:14:10 -0700 (PDT) Received: from localhost ([::1]:60614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSaV-0001uX-HW for importer@patchew.org; Wed, 02 Sep 2020 09:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMa-0006QF-5k for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53744 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMW-0007AP-7w for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:43 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-75-D-YzEJm_MuqgVIiVBD85RA-1; Wed, 02 Sep 2020 08:59:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05CC1191E2C0 for ; Wed, 2 Sep 2020 12:59:34 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6E1A5D9CC for ; Wed, 2 Sep 2020 12:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oRgWFwPCsjiXsgvA8dt9YmKQcm3JhszpEXfGbn5juR0=; b=YKXbvLJ274XHgS76YdQ/I17Q8//exrNnHAs/ARCSSO7ArYya2DlOIxYpdiCBF3XqlnOp+/ 04VAB8qynrGMXtMK8aOFsvPcl1ue3wLw1Exc6mOhCeL2BQYEFMCV8oZxcMfGfoVuBwZ28y kqpxNNgyDOTzKOQJw0Xs/LQFfIgIAaI= X-MC-Unique: D-YzEJm_MuqgVIiVBD85RA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 32/39] meson: keep all compiler flags detection together Date: Wed, 2 Sep 2020 08:59:10 -0400 Message-Id: <20200902125917.26021-33-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 57fadd3dab..4c32f5286f 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,23 @@ endforeach have_tools =3D 'CONFIG_TOOLS' in config_host have_block =3D have_system or have_tools =20 +python =3D import('python').find_installation() + +supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux'] +supported_cpus =3D ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv6= 4', 'x86', 'x86_64', + 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] + +cpu =3D host_machine.cpu_family() +targetos =3D host_machine.system() + +configure_file(input: files('scripts/ninjatool.py'), + output: 'ninjatool', + configuration: config_host) + +################## +# Compiler flags # +################## + add_project_arguments(config_host['QEMU_CFLAGS'].split(), native: false, language: ['c', 'objc']) add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), @@ -39,12 +56,6 @@ add_project_link_arguments(config_host['QEMU_LDFLAGS'].s= plit(), add_project_arguments(config_host['QEMU_INCLUDES'].split(), language: ['c', 'cpp', 'objc']) =20 -python =3D import('python').find_installation() - -################## -# Compiler flags # -################## - link_language =3D 'c' if not add_languages('cpp', required: false, native: false) # no warning @@ -73,17 +84,6 @@ if 'SPARSE_CFLAGS' in config_host 'compile_commands.json']) endif =20 -configure_file(input: files('scripts/ninjatool.py'), - output: 'ninjatool', - configuration: config_host) - -supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux'] -supported_cpus =3D ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv6= 4', 'x86', 'x86_64', - 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] - -cpu =3D host_machine.cpu_family() -targetos =3D host_machine.system() - m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) winmm =3D [] --=20 2.26.2