From nobody Sun Nov 16 16:27:30 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=1600853375; cv=none; d=zohomail.com; s=zohoarc; b=KIJY8jGXhtErdP+R93CaausLFpjxudIVlD2FApst+EwPGFfKK0u1f+lSLmH5yKN8x7ZiIeCqzybKPvTcdL1aldR4OOJSWDWbVxAJmMcDj7TiJ4nayl7qvx0t+rz22vuXE+I1eOq0rpW8pxYNDfvCnORHr/PY/hi0Oy4JK5jJ2bA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853375; h=Content-Type:Content-Transfer-Encoding:Cc: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=4M1byqklBkCEe+ean50U/60cDUM1sFdV+S1+041K3nQ=; b=Fyu/99owmMsPJBCia+l+nuSfzkTGZr32jndHu17rOwKfpEEJzgL5z5vHBEGmc7zOvRlc4sQcuQa0T15/EUnJtpFMn3J1xRHV4+jXbJIDeHD1hI34z5oGhezyR9yYwlKiKoSk9oyHpaHqZEW7nT6nahLED2/GOG8YVmUVxzISMXk= 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 1600853375946491.707112327583; Wed, 23 Sep 2020 02:29:35 -0700 (PDT) Received: from localhost ([::1]:47338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL15i-0006YK-Iy for importer@patchew.org; Wed, 23 Sep 2020 05:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL12n-0002cR-F0 for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL12f-0004YY-UY for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:33 -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-85-GIJXpJNlPRi6sh3w5QHpLA-1; Wed, 23 Sep 2020 05:26:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 797D5104D3E2; Wed, 23 Sep 2020 09:26:20 +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 373DB60BF1; Wed, 23 Sep 2020 09:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600853185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4M1byqklBkCEe+ean50U/60cDUM1sFdV+S1+041K3nQ=; b=K0ZbUfwd8KpTdRZXq6P+VRGTKiNAopOQj3dVW97w0U19VhFySOye5zEPu50S0JbvAOjRQa +NNNaTxAkWSCTEUcbKu65X4VQNPGafiKfs/61FGxjk3fy5VL+FCE41Vir2P31wqHA26Xju PMEZ7OoOAmpMEXkKv8vVtGZxDA9Yi4c= X-MC-Unique: GIJXpJNlPRi6sh3w5QHpLA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] configure: consistently pass CFLAGS/CXXFLAGS/LDFLAGS to meson Date: Wed, 23 Sep 2020 05:26:17 -0400 Message-Id: <20200923092617.1593722-5-pbonzini@redhat.com> In-Reply-To: <20200923092617.1593722-1-pbonzini@redhat.com> References: <20200923092617.1593722-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/22 23:02:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, 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: , Cc: Richard Henderson 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. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 25 +++++++++++++++---------- meson.build | 14 ++++++++++++-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/configure b/configure index d68a33e3c7..c2aa1885c3 100755 --- a/configure +++ b/configure @@ -7798,24 +7798,29 @@ echo "export PYTHON=3D'$python'" >> "$iotests_commo= n_env" if test "$skip_meson" =3D no; then cross=3D"config-meson.cross.new" meson_quote() { - echo "['$(echo $* | sed "s/ /','/g")']" + echo "'$(echo $* | sed "s/ /','/g")'" } =20 echo "# Automatically generated by configure - do not modify" > $cross echo "[properties]" >> $cross test -z "$cxx" && echo "link_language =3D 'c'" >> $cross +echo "[built-in options]" >> $cross +echo "c_args =3D [${CFLAGS:+$(meson_quote $CFLAGS)}]" >> $cross +echo "cpp_args =3D [${CXXFLAGS:+$(meson_quote $CXXFLAGS)}]" >> $cross +echo "c_link_args =3D [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross +echo "cpp_link_args =3D [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross echo "[binaries]" >> $cross -echo "c =3D $(meson_quote $cc)" >> $cross -test -n "$cxx" && echo "cpp =3D $(meson_quote $cxx)" >> $cross -echo "ar =3D $(meson_quote $ar)" >> $cross -echo "nm =3D $(meson_quote $nm)" >> $cross -echo "pkgconfig =3D $(meson_quote $pkg_config_exe)" >> $cross -echo "ranlib =3D $(meson_quote $ranlib)" >> $cross +echo "c =3D [$(meson_quote $cc)]" >> $cross +test -n "$cxx" && echo "cpp =3D [$(meson_quote $cxx)]" >> $cross +echo "ar =3D [$(meson_quote $ar)]" >> $cross +echo "nm =3D [$(meson_quote $nm)]" >> $cross +echo "pkgconfig =3D [$(meson_quote $pkg_config_exe)]" >> $cross +echo "ranlib =3D [$(meson_quote $ranlib)]" >> $cross if has $sdl2_config; then - echo "sdl2-config =3D $(meson_quote $sdl2_config)" >> $cross + echo "sdl2-config =3D [$(meson_quote $sdl2_config)]" >> $cross fi -echo "strip =3D $(meson_quote $strip)" >> $cross -echo "windres =3D $(meson_quote $windres)" >> $cross +echo "strip =3D [$(meson_quote $strip)]" >> $cross +echo "windres =3D [$(meson_quote $windres)]" >> $cross if test -n "$cross_prefix"; then cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross diff --git a/meson.build b/meson.build index cb0113ee90..4c73f4093a 100644 --- a/meson.build +++ b/meson.build @@ -1471,8 +1471,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