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=1600594321; cv=none; d=zohomail.com; s=zohoarc; b=Ri914WahHG/z98uQkKPF4mIPUy4OIruUe3ikPj2r4xrKRxxioscZIKwAEbYPf8h3wM8o5cUQfK97rZi81rTpOUEpRcdvxO9XvxTFadLMoUWNMAsRWlKybqFyuqVu2SVfsxwIsQuQ90ToUN9YMsw8TJ3bm9/N/qvZcJl8OBqkA+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600594321; 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=8V7m33mR/GkT/611spi62ViYrq3aOu5Qz1vILJEmu9Q=; b=Zd7wUK/44/1ebgRcyWuGYDqopxRrbAvvB1f/+f+FMXiJ+suRNrisUUaCca5ix7AbJA6qFK1ckbMpR3MJ6YwOri/PSftiVpKHTLWWGd+R5LGqSZhS2U2+v5pSln0WH8LbQBMZMjfqTYYOnisj9CMfzVeI4/yfTb2fZfkxKF7Spjo= 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 1600594321852421.31117852224145; Sun, 20 Sep 2020 02:32:01 -0700 (PDT) Received: from localhost ([::1]:42292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJvhP-0000Ei-SI for importer@patchew.org; Sun, 20 Sep 2020 05:31:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJvfs-00070F-6K for qemu-devel@nongnu.org; Sun, 20 Sep 2020 05:30:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJvfq-0002kJ-Ad for qemu-devel@nongnu.org; Sun, 20 Sep 2020 05:30:23 -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-303-EZpDRzCtMBmvkifmFQEZKA-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 46E491074644 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 150DF10027AA 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=1600594221; 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=8V7m33mR/GkT/611spi62ViYrq3aOu5Qz1vILJEmu9Q=; b=eU2XX0kfjy0sNlNSvoUAM3URxLo0w5BMTsyP1bB1ENID5Y41IucZuyqa13j0BSETxO2EEB MWU5tgzbdNwOCgRjVO0wcaDW5Tb4rxYNPjv+tDlpBfgaPAPQpH5QjIDgQGHFdstyEjfJYm 6j4Z7oVCNfbgPLIOIEYZbC+QWCSGyfo= X-MC-Unique: EZpDRzCtMBmvkifmFQEZKA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/4] configure: do not clobber environment CFLAGS/CXXFLAGS/LDFLAGS Date: Sun, 20 Sep 2020 05:30:15 -0400 Message-Id: <20200920093016.1150346-4-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" If the CFLAGS, CXXFLAGS or LDFLAGS variables are present in the environment, any modification made within the configure script is passed down to Meson. This is particularly undesirable for the "-pie" option, since it overrides "-shared" and thus messes up the linker flags for shared modules. Using a separate variable therefore fixes the bug, while clarifying that the scope of these CFLAGS is just the configure script. Reported-by: Frederic Bezies Analyzed-by: Toolybird Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 5fabc77fb3..9a0bbd2a69 100755 --- a/configure +++ b/configure @@ -155,7 +155,7 @@ update_cxxflags() { # options which some versions of GCC's C++ compiler complain about # because they only make sense for C programs. QEMU_CXXFLAGS=3D"$QEMU_CXXFLAGS -D__STDC_LIMIT_MACROS -D__STDC_CONSTAN= T_MACROS -D__STDC_FORMAT_MACROS" - CXXFLAGS=3D$(echo "$CFLAGS" | sed s/-std=3Dgnu99/-std=3Dgnu++11/) + CONFIGURE_CXXFLAGS=3D$(echo "$CONFIGURE_CFLAGS" | sed s/-std=3Dgnu99/-= std=3Dgnu++11/) for arg in $QEMU_CFLAGS; do case $arg in -Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\ @@ -170,13 +170,14 @@ update_cxxflags() { =20 compile_object() { local_cflags=3D"$1" - do_cc $CFLAGS $QEMU_CFLAGS $local_cflags -c -o $TMPO $TMPC + do_cc $CFLAGS $CONFIGURE_CFLAGS $QEMU_CFLAGS $local_cflags -c -o $TMPO $= TMPC } =20 compile_prog() { local_cflags=3D"$1" local_ldflags=3D"$2" - do_cc $CFLAGS $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $QEMU_L= DFLAGS $local_ldflags + do_cc $CFLAGS $CONFIGURE_CFLAGS $QEMU_CFLAGS $local_cflags -o $TMPE $TMP= C \ + $LDFLAGS $CONFIGURE_LDFLAGS $QEMU_LDFLAGS $local_ldflags } =20 # symbolically link $1 to $2. Portable version of "ln -sf". @@ -632,7 +633,10 @@ QEMU_CFLAGS=3D"-Wstrict-prototypes -Wredundant-decls $= QEMU_CFLAGS" QEMU_CFLAGS=3D"-D_GNU_SOURCE -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE = $QEMU_CFLAGS" QEMU_INCLUDES=3D"-iquote . -iquote ${source_path} -iquote ${source_path}/a= ccel/tcg -iquote ${source_path}/include" QEMU_INCLUDES=3D"$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl" -CFLAGS=3D"-std=3Dgnu99 -Wall" + +# Flags that are needed during configure but later taken care of by Meson +CONFIGURE_CFLAGS=3D"-std=3Dgnu99 -Wall" +CONFIGURE_LDFLAGS=3D =20 =20 check_define() { @@ -960,7 +964,7 @@ if test "$mingw32" =3D "yes" ; then EXESUF=3D".exe" HOST_DSOSUF=3D".dll" # MinGW needs -mthreads for TLS and macro _MT. - CFLAGS=3D"-mthreads $CFLAGS" + CONFIGURE_CFLAGS=3D"-mthreads $CONFIGURE_CFLAGS" write_c_skeleton; prefix=3D"/qemu" qemu_suffix=3D"" @@ -2230,7 +2234,7 @@ fi =20 if test "$static" =3D "yes"; then if test "$pie" !=3D "no" && compile_prog "-Werror -fPIE -DPIE" "-static-= pie"; then - CFLAGS=3D"-fPIE -DPIE $CFLAGS" + CONFIGURE_CFLAGS=3D"-fPIE -DPIE $CONFIGURE_CFLAGS" QEMU_LDFLAGS=3D"-static-pie $QEMU_LDFLAGS" pie=3D"yes" elif test "$pie" =3D "yes"; then @@ -2240,11 +2244,11 @@ if test "$static" =3D "yes"; then pie=3D"no" fi elif test "$pie" =3D "no"; then - CFLAGS=3D"$CFLAGS_NOPIE $CFLAGS" - LDFLAGS=3D"$LDFLAGS_NOPIE $LDFLAGS" + CONFIGURE_CFLAGS=3D"$CFLAGS_NOPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS=3D"$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then - CFLAGS=3D"-fPIE -DPIE $CFLAGS" - LDFLAGS=3D"-pie $LDFLAGS" + CONFIGURE_CFLAGS=3D"-fPIE -DPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS=3D"-pie $CONFIGURE_LDFLAGS" pie=3D"yes" elif test "$pie" =3D "yes"; then error_exit "PIE not available due to missing toolchain support" @@ -3808,7 +3812,7 @@ EOF if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ; then if cc_has_warning_flag "-Wno-unknown-attributes"; then glib_cflags=3D"-Wno-unknown-attributes $glib_cflags" - CFLAGS=3D"-Wno-unknown-attributes $CFLAGS" + CONFIGURE_CFLAGS=3D"-Wno-unknown-attributes $CONFIGURE_CFLAGS" fi fi =20 @@ -3828,7 +3832,7 @@ EOF if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ; then if cc_has_warning_flag "-Wno-unused-function"; then glib_cflags=3D"$glib_cflags -Wno-unused-function" - CFLAGS=3D"$CFLAGS -Wno-unused-function" + CONFIGURE_CFLAGS=3D"$CONFIGURE_CFLAGS -Wno-unused-function" fi fi =20 @@ -6359,7 +6363,7 @@ EOF =20 update_cxxflags =20 - if do_cxx $CXXFLAGS $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $QEMU_LDFLAG= S; then + if do_cxx $CONFIGURE_CXXFLAGS $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $Q= EMU_LDFLAGS; then # C++ compiler $cxx works ok with C compiler $cc : else --=20 2.26.2