From nobody Sun Nov 16 14:27:01 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=1600594323; cv=none; d=zohomail.com; s=zohoarc; b=ejHG9ECYQZ8+MeK+HhJh/8lsNhlkjK3kKDwTNRi9gwrVVQagiFroF4y0cU3onglNhT+1AuKuZ9MtJr8mue37oQvYQpXCvPtrBs/qfLGoMHZSXGsSSwdLgV0qbX234qOAD08njpkf4oAVrn7EtyFdOIM8DInmHk7qk3ItjWmWt/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600594323; 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=zD9jBe1EmwDBcxarRI11aTqgdpuDo9LGHH5SQT5KW94=; b=Pis4mW/KdtHmzog2U7fuAeGxECyimoJgXviGDiklXZ/2xcc2mwyxqD/YgM56GF1iDPV1Irz1YvyCYH6y/G/Pv4kBgED3Xw6i04kkW3M+gSvOxD9w3PKv0s9B2fFDy8TpZhE65nODzzLE6nH1B7pnlqvuTQc79zTot8vydj+q0rU= 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 160059432364588.27086988894007; Sun, 20 Sep 2020 02:32:03 -0700 (PDT) Received: from localhost ([::1]:42448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJvhR-0000Ic-V4 for importer@patchew.org; Sun, 20 Sep 2020 05:32:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJvfs-00070E-5y 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]:59257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJvfp-0002jX-PS 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-267-Gp-Z_fanN96gh_kbumXb9Q-1; Sun, 20 Sep 2020 05:30:18 -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 A9F7710066FF for ; Sun, 20 Sep 2020 09:30:17 +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 5E13D1002C04 for ; Sun, 20 Sep 2020 09:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600594220; 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=zD9jBe1EmwDBcxarRI11aTqgdpuDo9LGHH5SQT5KW94=; b=T26mQPt3+nxEAlM65bmJN54Ig7XyVrgN2teMg8s9ccQn7r0NE3XOGjnh3OlAreQ4vofW2g NxVHjaYSVf/A5ETYh3cW54utRKDh3YccnO7qGAEn37dNiblZBi1evkWH21O+vfNsc9wfxk u08y+Cl3ko85sZGLjI34IxsNbRmYVRk= X-MC-Unique: Gp-Z_fanN96gh_kbumXb9Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/4] configure: cleanup invocation of submodule Make Date: Sun, 20 Sep 2020 05:30:13 -0400 Message-Id: <20200920093016.1150346-2-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, UPPERCASE_50_75=0.008 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" Move common command line options to SUBDIR_MAKEFLAGS, thus simplifying the rules themselves. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- 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