From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751585AbbLRK5W (ORCPT ); Fri, 18 Dec 2015 05:57:22 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:63217 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750943AbbLRK5U (ORCPT ); Fri, 18 Dec 2015 05:57:20 -0500 From: Wang Nan To: CC: , , Wang Nan , Jiri Olsa Subject: [PATCH] tools build: Output more data during feature detection Date: Fri, 18 Dec 2015 10:56:51 +0000 Message-ID: <1450436211-170447-1-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <5673C8A6.1080806@bmw-carit.de> References: <5673C8A6.1080806@bmw-carit.de> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.5673E683.007F,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 77dfb50f8a71a1e56e364c3d080cf2ba Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Even with current '.make.output' finding the root cause for missing feature is not enough. This patch adds extra information to .make.output. It also creates a .make.makeoutput to collect output of 'make'. Signed-off-by: Wang Nan Cc: Daniel Wagner Cc: Jiri Olsa --- tools/build/Makefile.feature | 4 ++-- tools/build/feature/Makefile | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 6c0519d..84927df 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -1,13 +1,13 @@ feature_dir := $(srctree)/tools/build/feature ifneq ($(OUTPUT),) - OUTPUT_FEATURES = $(OUTPUT)feature/ + OUTPUT_FEATURES = $(OUTPUT)feature$(FEATURE_USER)/ $(shell mkdir -p $(OUTPUT_FEATURES)) 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 $(feature_dir) $(OUTPUT_FEATURES)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) $(OUTPUT_FEATURES)test-$1.bin >$(OUTPUT_FEATURES)test-$1.make.makeoutput 2>&1 && echo 1 || echo 0) endef feature_set = $(eval $(feature_set_code)) diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index bf8f035..842973a 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -45,7 +45,12 @@ PKG_CONFIG := $(CROSS_COMPILE)pkg-config all: $(FILES) __BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS) - BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1 + BUILD = echo PWD=$(shell pwd) > $(@:.bin=.make.output); \ + echo PATH=$$PATH >> $(@:.bin=.make.output); \ + echo CFLAGS=$$CFLAGS >> $(@:.bin=.make.output); \ + echo LDFLAGS=$$LDFLAGS >> $(@:.bin=.make.output); \ + echo '$(__BUILD)' >> $(@:.bin=.make.output) ; \ + $(__BUILD) >> $(@:.bin=.make.output) 2>&1 ############################### -- 1.8.3.4