Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754367AbbK0JHK (ORCPT ); Fri, 27 Nov 2015 04:07:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60779 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754143AbbK0JG6 (ORCPT ); Fri, 27 Nov 2015 04:06:58 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Wang Nan , lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra Subject: [PATCH 2/2] perf build: Use FEATURE-INCLUDE in bpf subproject Date: Fri, 27 Nov 2015 10:06:51 +0100 Message-Id: <1448615211-16074-2-git-send-email-jolsa@kernel.org> In-Reply-To: <1448615211-16074-1-git-send-email-jolsa@kernel.org> References: <1448615211-16074-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1541 Lines: 48 Using FEATURE-INCLUDE in bpf subproject in case bpf is built via perf. Keep the current features detection for other cases. Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-utuczk899ckz6qtggqvhm7yu@git.kernel.org Signed-off-by: Jiri Olsa --- tools/lib/bpf/Makefile | 4 ++++ tools/perf/Makefile.perf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 6916cbe962a5..6b9af77418b3 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -80,7 +80,11 @@ endif endif ifeq ($(check_feat),1) +ifeq ($(FEATURES_INCLUDE),) include $(srctree)/tools/build/Makefile.feature +else +include $(FEATURES_INCLUDE) +endif endif export prefix libdir src obj diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index b74f924185b7..7338a7e62fcd 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -431,7 +431,7 @@ $(LIBAPI)-clean: $(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null $(LIBBPF): fixdep FORCE - $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a + $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a FEATURES_INCLUDE=$(realpath $(OUTPUT)FEATURE-INCLUDE) $(LIBBPF)-clean: $(call QUIET_CLEAN, libbpf) -- 2.4.3 -- 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/