From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932080AbbCVKQq (ORCPT ); Sun, 22 Mar 2015 06:16:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57345 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751778AbbCVKQp (ORCPT ); Sun, 22 Mar 2015 06:16:45 -0400 Date: Sun, 22 Mar 2015 03:16:08 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: david.ahern@oracle.com, hpa@zytor.com, cjashfor@linux.vnet.ibm.com, paulus@samba.org, acme@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, namhyung@kernel.org, mingo@kernel.org Reply-To: cjashfor@linux.vnet.ibm.com, hpa@zytor.com, david.ahern@oracle.com, paulus@samba.org, jolsa@kernel.org, acme@redhat.com, mingo@kernel.org, peterz@infradead.org, namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Make features checks directory configurable Git-Commit-ID: 970e87b33820205b31306dfb734771842874767c 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 Commit-ID: 970e87b33820205b31306dfb734771842874767c Gitweb: http://git.kernel.org/tip/970e87b33820205b31306dfb734771842874767c Author: Jiri Olsa AuthorDate: Sun, 1 Mar 2015 21:12:25 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Sat, 21 Mar 2015 14:53:34 -0300 perf build: Make features checks directory configurable Putting feature checks directory into $feature_dir, so it's easy to configure when we move it to bools/build later. Signed-off-by: Jiri Olsa Cc: Corey Ashford Cc: David Ahern Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-sq2nsds6uk93372iyxcqcf6q@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/config/Makefile.feature | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/config/Makefile.feature b/tools/perf/config/Makefile.feature index 8c98bbc..ea83a92 100644 --- a/tools/perf/config/Makefile.feature +++ b/tools/perf/config/Makefile.feature @@ -1,3 +1,5 @@ +feature_dir := $(srctree)/tools/perf/config/feature-checks + ifneq ($(OUTPUT),) OUTPUT_FEATURES = $(OUTPUT)config/feature-checks/ $(shell mkdir -p $(OUTPUT_FEATURES)) @@ -5,7 +7,7 @@ endif feature_check = $(eval $(feature_check_code)) define feature_check_code - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C config/feature-checks test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) + feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) endef feature_set = $(eval $(feature_set_code)) @@ -91,7 +93,7 @@ ifeq ($(feature-all), 1) # $(foreach feat,$(FEATURE_TESTS),$(call feature_set,$(feat))) else - $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(addsuffix .bin,$(FEATURE_TESTS)) >/dev/null 2>&1) + $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -i -j -C $(feature_dir) $(addsuffix .bin,$(FEATURE_TESTS)) >/dev/null 2>&1) $(foreach feat,$(FEATURE_TESTS),$(call feature_check,$(feat))) endif