From nobody Sun Nov 16 14:04:14 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=1600853997; cv=none; d=zohomail.com; s=zohoarc; b=Z8oz+7RHtvUO/2VxZyXtlXePRf3m6OMtVM7WOS0cbtgRkuiPaft9lW08PPD9pFm7RdijPhU6e8Z6Ozj4jGzosxnkhVmwD3DOviwuU9BAWzxObG3Psr9BG9A/SBqqFGvvHxxf94OD4MJHHlNzh1feggevzMvCkrbhnIsU/gL4NYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853997; 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=bqcz9zMZVfXO4ocPDe35ChuIEPNYeBuL4x4ZAuyc9Ik=; b=F6u+YemvmZvvDw8ycSoxVuFzUZIWOEXbum+xh8DmVOR4K9qnYJSAQENlXbmtpRa+jemOZ+NdDnqnUPR8/e59TquFcwzig4Z0begIG3l42bHknx8xGOdMZLnXPa8pr9HEHubFnaA0ILmELnP89Y3ygacZ0tsQDfnSG3p/sZdiZZ8= 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 1600853997172950.223813293794; Wed, 23 Sep 2020 02:39:57 -0700 (PDT) Received: from localhost ([::1]:43698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL1Fi-0000S6-SC for importer@patchew.org; Wed, 23 Sep 2020 05:39:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL12l-0002cG-U3 for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:53939 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 1kL12e-0004Xz-1f for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:31 -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-588-nWKpi698NluJ-fsG7JG7HQ-1; Wed, 23 Sep 2020 05:26:20 -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 52FE281F010; Wed, 23 Sep 2020 09:26:19 +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 1042B60BF1; Wed, 23 Sep 2020 09:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600853182; 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=bqcz9zMZVfXO4ocPDe35ChuIEPNYeBuL4x4ZAuyc9Ik=; b=MP8YLGC0q66/uaLdJSrli4tSag641DPpzlcGxIfM2NdcTt8lH5T2WdUquI3MdnZQxfyIq3 1hcU1mm22XNYSAwCezmko5U1sIKh2CmBxaeiyeijz32tp0V88FiObDu4bZLYT1zcDnsBX7 bGMGyo4OHXzjQp78n+9zi3nrnvqfchM= X-MC-Unique: nWKpi698NluJ-fsG7JG7HQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] configure: cleanup invocation of submodule Make Date: Wed, 23 Sep 2020 05:26:14 -0400 Message-Id: <20200923092617.1593722-2-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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 05:11:39 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, 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" Move common command line options to SUBDIR_MAKEFLAGS, thus simplifying the rules themselves. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- Makefile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 897246d77c..57fb63832f 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,12 @@ configure: ; .PHONY: all clean distclean install \ recurse-all dist msi FORCE =20 -SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) +SUBMODULE_CFLAGS =3D $(QEMU_CFLAGS) $(CFLAGS) +SUBDIR_MAKEFLAGS =3D $(if $(V),,--no-print-directory --quiet) \ + PKG_CONFIG=3D"$(PKG_CONFIG)" \ + CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" \ + CFLAGS=3D"$(SUBMODULE_CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)" \ + ARFLAGS=3D"$(ARFLAGS)" =20 include $(SRC_PATH)/tests/Makefile.include =20 @@ -146,12 +151,12 @@ Makefile: $(addsuffix /all, $(SUBDIRS)) =20 # LIBFDT_lib=3D"": avoid breaking existing trees with objects requiring -f= PIC DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_lib=3D"" -DTC_CFLAGS=3D$(CFLAGS) $(QEMU_CFLAGS) DTC_CPPFLAGS=3D-I$(SRC_PATH)/dtc/libfdt =20 .PHONY: dtc/all dtc/all: .git-submodule-status dtc/libfdt - $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS=3D"$(DTC_CPPFLAGS)= " CFLAGS=3D"$(DTC_CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)" ARFLAGS=3D"$(ARFLAGS= )" CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,) + $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) \ + CPPFLAGS=3D"$(DTC_CPPFLAGS)" $(SUBDIR_MAKEFLAGS) libfdt,) =20 dtc/%: .git-submodule-status @mkdir -p $@ @@ -161,7 +166,7 @@ dtc/%: .git-submodule-status # Therefore we replicate some of the logic in the sub-makefile. # Remove all the extra -Warning flags that QEMU uses that Capstone doesn't; # no need to annoy QEMU developers with such things. -CAP_CFLAGS =3D $(patsubst -W%,,$(CFLAGS) $(QEMU_CFLAGS)) $(CAPSTONE_CFLAGS) +CAP_CFLAGS :=3D $(patsubst -W%,,$(SUBMODULE_CFLAGS)) $(CAPSTONE_CFLAGS) CAP_CFLAGS +=3D -DCAPSTONE_USE_SYS_DYN_MEM CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM64 @@ -169,16 +174,17 @@ CAP_CFLAGS +=3D -DCAPSTONE_HAS_POWERPC CAP_CFLAGS +=3D -DCAPSTONE_HAS_X86 =20 .PHONY: capstone/all +capstone/all: SUBMODULE_CFLAGS =3D $(CAP_CFLAGS) capstone/all: .git-submodule-status - $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=3Dno= BUILDDIR=3D"$(BUILD_DIR)/capstone" CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" = RANLIB=3D"$(RANLIB)" CFLAGS=3D"$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_D= IR)/capstone/$(LIBCAPSTONE)) + $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone \ + CAPSTONE_SHARED=3Dno BUILDDIR=3D"$(BUILD_DIR)/capstone" \ + $(SUBDIR_MAKEFLAGS) $(BUILD_DIR)/capstone/$(LIBCAPSTONE)) =20 .PHONY: slirp/all slirp/all: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp \ - BUILD_DIR=3D"$(BUILD_DIR)/slirp" \ - PKG_CONFIG=3D"$(PKG_CONFIG)" \ - CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" \ - CFLAGS=3D"$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)") + BUILD_DIR=3D"$(BUILD_DIR)/slirp" \ + $(SUBDIR_MAKEFLAGS)) =20 ROM_DIRS =3D $(addprefix pc-bios/, $(ROMS)) ROM_DIRS_RULES=3D$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) --=20 2.26.2 From nobody Sun Nov 16 14:04:14 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=1600853905; cv=none; d=zohomail.com; s=zohoarc; b=YpBIgTRnBy/8nbF9wOZ48Q89lV9oREGKTYerv6uYZRUXqEso3ulLG+7IGTDv0eqeOZF1k3tlKK8NjehC+yagrfvCEu6nTrwmjD5RG+CzHSJZHuHyD4Qr4wmfTLD4RtMMVG4CwpAMYhOTvrRxvIwn6whv4hiJaflcZhE69+8054I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853905; 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=07LcNJyvfIgjKm2ZgdgFmj83qm7MX/wQk0q80u2dgNs=; b=lqn5oaZZqaqu8qBN1EQsbd3Xn7HgUevysgWw67SLQ4sccBoqsaOpuAedF54WZurtuNL+UagdBHSMy4wLIEY5HP04Z5bB85rxAbuEmOgNGPaUfB9yBG+0DvJiskADoP/G/w557zAYCnDxTHvE29IJ0yBnEwFCDKSgy0LxzyN8jpY= 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 1600853905286316.86586981689425; Wed, 23 Sep 2020 02:38:25 -0700 (PDT) Received: from localhost ([::1]:39510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL1EF-00075n-PG for importer@patchew.org; Wed, 23 Sep 2020 05:38:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL12m-0002cL-62 for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34368) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL12e-0004Y1-3A for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:31 -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-264-ocZDr_HuMX-_Fu6KaCHXFw-1; Wed, 23 Sep 2020 05:26:20 -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 B112FAD680; Wed, 23 Sep 2020 09:26:19 +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 6ECA560CCC; Wed, 23 Sep 2020 09:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600853182; 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=07LcNJyvfIgjKm2ZgdgFmj83qm7MX/wQk0q80u2dgNs=; b=iWhUDd85ZKcsmJYB8+P2UITxRKchoBU0gFQL04HivPwXH8HQWxXon0DN0lvtPIthWqgCqI ulB/yY6zUpJ98YhcfAn8NHv9e0A9JnBVK+zwkfmO90jyb/CGTTu6u61MooreT51eGRWnQh CGzoyGtr24c89AiDZh495GHKEqc132U= X-MC-Unique: ocZDr_HuMX-_Fu6KaCHXFw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] configure: cleanup CFLAGS and LDFLAGS for submodules Date: Wed, 23 Sep 2020 05:26:15 -0400 Message-Id: <20200923092617.1593722-3-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=63.128.21.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/23 00:53:58 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" The -g and -O2 flags that configure adds to CFLAGS are only used by submodu= les, so do not put anymore the confusing CFLAGS variable in config-host.mak and replace it with more explicit SUBMODULE_CFLAGS variable. There was also no equivalent SUBMODULE_LDFLAGS variable, add it. This would theoretically help with LTO if we want -g and -O2 options on the command li= ne. I say "theoretically" because submodules should not be linking anything; but since we were passing an "LD" variable we might as well get its flags right. CFLAGS are now synthesized in the configuration summary as a quick way to p= resent --enable-debug and --enable-debug-info. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- Makefile | 3 +-- configure | 20 ++++++++++++++++---- meson.build | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 57fb63832f..3367ca520c 100644 --- a/Makefile +++ b/Makefile @@ -137,11 +137,10 @@ configure: ; .PHONY: all clean distclean install \ recurse-all dist msi FORCE =20 -SUBMODULE_CFLAGS =3D $(QEMU_CFLAGS) $(CFLAGS) SUBDIR_MAKEFLAGS =3D $(if $(V),,--no-print-directory --quiet) \ PKG_CONFIG=3D"$(PKG_CONFIG)" \ CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" \ - CFLAGS=3D"$(SUBMODULE_CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)" \ + CFLAGS=3D"$(SUBMODULE_CFLAGS)" LDFLAGS=3D"$(SUBMODULE_LDFLAGS)" \ ARFLAGS=3D"$(ARFLAGS)" =20 include $(SRC_PATH)/tests/Makefile.include diff --git a/configure b/configure index dfecfd6c16..b04350f7ea 100755 --- a/configure +++ b/configure @@ -6112,12 +6112,23 @@ elif test "$fortify_source" =3D "yes" ; then QEMU_CFLAGS=3D"-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D2 $QEMU_CFLAGS" debug=3Dno fi + +SUBMODULE_CFLAGS=3D-Wall +SUBMODULE_LDFLAGS=3D +if test "$pie" =3D "yes"; then + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS -fPIE" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS -pie" +else + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS $CFLAGS_NOPIE" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS $LDFLAGS_NOPIE" +fi if test "$debug_info" =3D "yes"; then - CFLAGS=3D"-g $CFLAGS" - LDFLAGS=3D"-g $LDFLAGS" + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS -g" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS -g" fi if test "$debug" =3D "no"; then - CFLAGS=3D"-O2 $CFLAGS" + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS -O2" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS -O2" fi =20 case "$ARCH" in @@ -7292,7 +7303,8 @@ echo "RANLIB=3D$ranlib" >> $config_host_mak echo "NM=3D$nm" >> $config_host_mak echo "PKG_CONFIG=3D$pkg_config_exe" >> $config_host_mak echo "WINDRES=3D$windres" >> $config_host_mak -echo "CFLAGS=3D$CFLAGS" >> $config_host_mak +echo "SUBMODULE_CFLAGS=3D$CFLAGS \$(QEMU_CFLAGS) $SUBMODULE_CFLAGS" >> $co= nfig_host_mak +echo "SUBMODULE_LDFLAGS=3D$LDFLAGS \$(QEMU_LDFLAGS) $SUBMODULE_LDFLAGS" >>= $config_host_mak echo "CFLAGS_NOPIE=3D$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak diff --git a/meson.build b/meson.build index 9aeefa60fb..cb0113ee90 100644 --- a/meson.build +++ b/meson.build @@ -1471,7 +1471,8 @@ 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': config_host['CFLAGS']} +summary_info +=3D {'CFLAGS': '-O' + get_option('optimization') + + (get_option('debug') ? ' -g' = : '')} 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 From nobody Sun Nov 16 14:04:14 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=1600854161; cv=none; d=zohomail.com; s=zohoarc; b=K8Fql2w/bJy36IQZW5rw567a/JFkLKYHD93Nb+3GJk+HOof+YQzXjq0f/s5wTseOrAvd09zPld26vD2gUreld4nN1JaPluZNTWcEnH46SBPUhi+2jJlJxvBIKZAGo1VEbvfhkVfWFRFNkAkHS8EpMXu5S5t49rBzgpTg1Q2fWrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600854161; 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=CiwfAPLEH/qgNI/XSApVX0T/UYuaSpoMjp02DqZ25aE=; b=eYgben23QItwhFdU0/ZNpVUqZirDIkPeZon4oNnA/yk3Z1vqaelBjFT7xfqEsNHwLLR+mUtCRTxNAX9tDApH2fur6SGcqJ74qcNh9qtIZ1r59JhexfY0syMbfoby1p7uOHcqkXVkOWWJ+U84QeKAXg5B9YOYiP6ieoK0Wnx6z80= 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 1600854161335334.09221210662804; Wed, 23 Sep 2020 02:42:41 -0700 (PDT) Received: from localhost ([::1]:48076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL1IO-0002Uz-3v for importer@patchew.org; Wed, 23 Sep 2020 05:42:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL12o-0002ep-Lp for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL12e-0004YC-NU for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:34 -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-39-1yKlwQrgNq6m2aTQ9gDZ0w-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 1C404AD685; 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 CD10860BF1; Wed, 23 Sep 2020 09:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600853183; 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=CiwfAPLEH/qgNI/XSApVX0T/UYuaSpoMjp02DqZ25aE=; b=aN/0boJ2Xw1WQR+Gh25MLxKVUshhyzLnbKbMx2vmxcy0xfPRaipylIw+JeTyMQhe1l96R5 sXz4KlC7AKPQ48Eloy5AVe08mXFklqpuUyOgsVpsS6SqnyucfxGicN54oehr/trxLOq0UV mrqeZeD0Z1XWubluzIKUm+VnaoBkOzw= X-MC-Unique: 1yKlwQrgNq6m2aTQ9gDZ0w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] configure: do not clobber environment CFLAGS/CXXFLAGS/LDFLAGS Date: Wed, 23 Sep 2020 05:26:16 -0400 Message-Id: <20200923092617.1593722-4-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" 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 Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/configure b/configure index b04350f7ea..d68a33e3c7 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". @@ -639,7 +640,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() { @@ -967,7 +971,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"" @@ -2234,7 +2238,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 @@ -2244,11 +2248,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" @@ -3812,7 +3816,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 @@ -3832,7 +3836,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 @@ -6370,7 +6374,7 @@ EOF =20 update_cxxflags =20 - if do_cxx $CXXFLAGS $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $QEMU_LDFLAG= S; then + if do_cxx $CXXFLAGS $CONFIGURE_CXXFLAGS $QEMU_CXXFLAGS -o $TMPE $TMPCX= X $TMPO $QEMU_LDFLAGS; then # C++ compiler $cxx works ok with C compiler $cc : else --=20 2.26.2 From nobody Sun Nov 16 14:04:14 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