From nobody Mon Nov 17 08:01:27 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=1603728112; cv=none; d=zohomail.com; s=zohoarc; b=hGktbqyTpsRfMLh0rtF+H6NCe5UcoC7yYEI6Hq9fMRppy/ajCj9a2+JJ36e1g/EV7xWeYIHnM2Ev6oiZyzrsXaq/ld3b9ixQbrN7HNkIaiVImup55NdAihFQmlFlZLrD8uvw7AyPgvjN40XdKrQeTrD53e5uYlXUP0/UgmRZStM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603728112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VP/pTg1ry8GVH2wvNg1/MLXi+5kpgB3hlJb/8jMX8/A=; b=Ur4I6kg8Mjz3IcpjTs4wnLfPxIhYYwcfT7ZJiNuRM4GwYRTm2+7FpaqANfeN5o2cfKoXj3dI3LPdUQU2u/aVMoJZ4X6YDjcD3hMYNztMy8wlUDLKqN14+eUvIRQ6LzijRix6RAy/SA10+FM4UDchx2A2h+bWOjeg5a8lfeCxvj4= 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 16037281121691014.7703837362476; Mon, 26 Oct 2020 09:01:52 -0700 (PDT) Received: from localhost ([::1]:33240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX4wQ-0001Zz-4T for importer@patchew.org; Mon, 26 Oct 2020 12:01:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX4tk-0007yj-LV for qemu-devel@nongnu.org; Mon, 26 Oct 2020 11:59:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kX4th-0005Kq-Ct for qemu-devel@nongnu.org; Mon, 26 Oct 2020 11:59:04 -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-582-8oXUmMcQMLGj1Az7eyqmqA-1; Mon, 26 Oct 2020 11:58:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54E5AA0BDC; Mon, 26 Oct 2020 15:58:55 +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 112B262A14; Mon, 26 Oct 2020 15:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603727940; 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; bh=VP/pTg1ry8GVH2wvNg1/MLXi+5kpgB3hlJb/8jMX8/A=; b=fGT6qr9JadYqiy+crBNbVa28Fbj+HuwR3+LyS4MxA40lfRwunR/zSMXiN2IC8niiqD7CZ4 1AXhr9v3ZkBCSR2iKH8ARuBEQuaJJxEuK3fNOeThwoOKcTLnzwEyHj17vJ0XgQsLp0SmZN I0SLLU/G00msBGlec8UI2gqnwiyOgMM= X-MC-Unique: 8oXUmMcQMLGj1Az7eyqmqA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] makefile: handle -n / -k / -q correctly Date: Mon, 26 Oct 2020 11:58:54 -0400 Message-Id: <20201026155854.3074290-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Type: text/plain; charset="utf-8" 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/10/25 21:03:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Use $(findstring) instead of $(filter) to detect -n/-k as different versions of MAKE fill in $(MAKEFLAGS) differently. Do not bother running ninja at all if -nq is passed. Tested-by: Alex Benn=C3=A9e Signed-off-by: Paolo Bonzini --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4d1fa8bb3d..e7c1000f5c 100644 --- a/Makefile +++ b/Makefile @@ -146,9 +146,12 @@ endif # 4. Rules to bridge to other makefiles =20 ifneq ($(NINJA),) -NINJAFLAGS =3D $(if $V,-v,) \ +MAKE.n =3D $(findstring n,$(firstword $(MAKEFLAGS))) +MAKE.k =3D $(findstring k,$(firstword $(MAKEFLAGS))) +MAKE.q =3D $(findstring q,$(firstword $(MAKEFLAGS))) +MAKE.nq =3D $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) +NINJAFLAGS =3D $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ - $(subst -k, -k0, $(filter -n -k,$(MAKEFLAGS))) =20 ninja-cmd-goals =3D $(or $(MAKECMDGOALS), all) ninja-cmd-goals +=3D $(foreach t, $(.tests), $(.test.deps.$t)) @@ -165,7 +168,8 @@ $(ninja-targets): run-ninja # --output-sync line. run-ninja: config-host.mak ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) - +@$(NINJA) $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-go= als))) | cat + +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) \ + $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) |= cat) endif endif =20 --=20 2.26.2