From nobody Sun Nov 16 14:27:00 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=1600594322; cv=none; d=zohomail.com; s=zohoarc; b=CYV5lGZSreWMbl9uVxPTjaX0GwWoY6FFxvdIM3G5RFIiofoi4TfB5LMqf+2pNHyZofVH0ik3iBLI1xPObgcf/uVMIIuCl4Wy6wy0PO9S4n0HeELGiVAVhaAsNUXlIkAm0yNEjm7rRfPKCryY+2y99kzZunFEnjGl8hX36PItkv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600594322; 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=LHBJDxC5tsf8NwakBt/hHSljlYUWYdVMRcAk6Ejn8bU=; b=ApzZCtsP7Dp2F4zZe8biQGYqja5o1ip/U4cmzQfO9JDxEC3arAwEpxQGOVsyTMwHczlL22KzJuZd65fiPgabHYDIhEwFYc9BtKOTY76gfq0O1c7dvhTwTgJzGfmkDqwWIn0Eu8thbgzJwhOLRBKk4kpvhu3w9phULNo+Vwgkit0= 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 160059432269055.76402445716849; Sun, 20 Sep 2020 02:32:02 -0700 (PDT) Received: from localhost ([::1]:42496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJvhR-0000Jo-7C for importer@patchew.org; Sun, 20 Sep 2020 05:32:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJvfu-00072i-AI for qemu-devel@nongnu.org; Sun, 20 Sep 2020 05:30:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJvfs-0002l1-DW for qemu-devel@nongnu.org; Sun, 20 Sep 2020 05:30:26 -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-395--gmcDuq6NY-SqaugJ090qQ-1; Sun, 20 Sep 2020 05:30:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94B6E8030C7 for ; Sun, 20 Sep 2020 09:30:18 +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 617B7100164C for ; Sun, 20 Sep 2020 09:30:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600594223; 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=LHBJDxC5tsf8NwakBt/hHSljlYUWYdVMRcAk6Ejn8bU=; b=fy5CsPSDlRtLvg2FjdwBQO7nHek437F7Ia2IJb53X1s/MgDb2kSOoqbw/OyuO2jNKWaZnN ZUm+mpWgphUCyZvzB05yHvTAZjDfl2fWWgE6JUua8l3aGZvkDqSYtp9tGJ7bZ929u6BbiQ 9aYN6+doe6SScmzLJhUPzQ2b3/e/98w= X-MC-Unique: -gmcDuq6NY-SqaugJ090qQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/4] configure: consistently pass CFLAGS/CXXFLAGS/LDFLAGS to meson Date: Sun, 20 Sep 2020 05:30:16 -0400 Message-Id: <20200920093016.1150346-5-pbonzini@redhat.com> In-Reply-To: <20200920093016.1150346-1-pbonzini@redhat.com> References: <20200920093016.1150346-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 03:58:12 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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" Environment variables like CFLAGS are easy to accidentally change. Meson warns if that happens, but in a project with a lot of configuration that is easy to lose. It is also surprising behavior since meson caches -D options and remembers those on reconfiguration (which we rely on, since configure options become -D options). By placing the user-provided CFLAGS, CXXFLAGS and LDFLAGS in the cross file, we at least get consistent behavior. These environment variables are still ugly and not really recommended, but there are distros that rely on them. For the gory details, refer to https://github.com/mesonbuild/meson/issues/4664. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 4 ++++ meson.build | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9a0bbd2a69..952a7479ab 100755 --- a/configure +++ b/configure @@ -7794,6 +7794,10 @@ meson_quote() { echo "# Automatically generated by configure - do not modify" > $cross echo "[properties]" >> $cross test -z "$cxx" && echo "link_language =3D 'c'" >> $cross +echo "c_args =3D $(meson_quote $CFLAGS)" >> $cross +echo "cpp_args =3D $(meson_quote $CXXFLAGS)" >> $cross +echo "c_link_args =3D $(meson_quote $LDFLAGS)" >> $cross +echo "cpp_link_args =3D $(meson_quote $LDFLAGS)" >> $cross echo "[binaries]" >> $cross echo "c =3D $(meson_quote $cc)" >> $cross test -n "$cxx" && echo "cpp =3D $(meson_quote $cxx)" >> $cross diff --git a/meson.build b/meson.build index 1099f2a87c..4d6ef64adf 100644 --- a/meson.build +++ b/meson.build @@ -1476,8 +1476,18 @@ if targetos =3D=3D 'darwin' summary_info +=3D {'Objective-C compiler': meson.get_compiler('objc').cm= d_array()[0]} endif summary_info +=3D {'ARFLAGS': config_host['ARFLAGS']} -summary_info +=3D {'CFLAGS': '-O' + get_option('optimization') - + (get_option('debug') ? ' -g' = : '')} +summary_info +=3D {'CFLAGS': ' '.join(get_option('c_args') + + ['-O' + get_option('optim= ization')] + + (get_option('debug') ? ['= -g'] : []))} +if link_language =3D=3D 'cpp' + summary_info +=3D {'CXXFLAGS': ' '.join(get_option('cpp_args') + + ['-O' + get_option('optim= ization')] + + (get_option('debug') ? ['= -g'] : []))} +endif +link_args =3D get_option(link_language + '_link_args') +if link_args.length() > 0 + summary_info +=3D {'LDFLAGS': ' '.join(link_args)} +endif summary_info +=3D {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} summary_info +=3D {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info +=3D {'make': config_host['MAKE']} --=20 2.26.2