Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753316AbbKZIWg (ORCPT ); Thu, 26 Nov 2015 03:22:36 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56105 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753191AbbKZIWb (ORCPT ); Thu, 26 Nov 2015 03:22:31 -0500 Date: Thu, 26 Nov 2015 00:22:10 -0800 From: tip-bot for Wang Nan Message-ID: Cc: tglx@linutronix.de, ast@kernel.org, masami.hiramatsu.pt@hitachi.com, mingo@kernel.org, lizefan@huawei.com, hpa@zytor.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, acme@redhat.com, wangnan0@huawei.com Reply-To: tglx@linutronix.de, ast@kernel.org, lizefan@huawei.com, hpa@zytor.com, mingo@kernel.org, masami.hiramatsu.pt@hitachi.com, wangnan0@huawei.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com In-Reply-To: <1448372181-151723-3-git-send-email-wangnan0@huawei.com> References: <1448372181-151723-3-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib bpf: Don' t do a feature check when cleaning Git-Commit-ID: d8ad6a15cc3a364de6c8010378adc3fb06ce3ff1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2638 Lines: 85 Commit-ID: d8ad6a15cc3a364de6c8010378adc3fb06ce3ff1 Gitweb: http://git.kernel.org/tip/d8ad6a15cc3a364de6c8010378adc3fb06ce3ff1 Author: Wang Nan AuthorDate: Tue, 24 Nov 2015 13:36:07 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 25 Nov 2015 16:38:13 -0300 tools lib bpf: Don't do a feature check when cleaning Before this patch libbpf always do feature check even when cleaning. For example: $ cd kernel/tools/lib/bpf $ make Auto-detecting system features: ... libelf: [ on ] ... bpf: [ on ] CC libbpf.o CC bpf.o LD libbpf-in.o LINK libbpf.a LINK libbpf.so $ make clean CLEAN libbpf CLEAN core-gen $ make clean Auto-detecting system features: ... libelf: [ on ] ... bpf: [ on ] CLEAN libbpf CLEAN core-gen $ Although the first 'make clean' doesn't show feature check result, it still does the check. No output because check result is similar to FEATURE-DUMP.libbpf. This patch uses same method as perf to turn off feature checking when 'make clean'. Reported-and-Tested-by: Arnaldo Carvalho de Melo Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1448372181-151723-3-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index a3caaf3..636e3dd 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -71,7 +71,17 @@ FEATURE_DISPLAY = libelf bpf INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/arch/$(ARCH)/include/uapi -I$(srctree)/include/uapi FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES) +check_feat := 1 +NON_CHECK_FEAT_TARGETS := clean TAGS tags cscope help +ifdef MAKECMDGOALS +ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),) + check_feat := 0 +endif +endif + +ifeq ($(check_feat),1) include $(srctree)/tools/build/Makefile.feature +endif export prefix libdir src obj -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/