From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933111AbdDQIli (ORCPT ); Mon, 17 Apr 2017 04:41:38 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52263 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932354AbdDQIlf (ORCPT ); Mon, 17 Apr 2017 04:41:35 -0400 Date: Mon, 17 Apr 2017 01:35:56 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: linux-kernel@vger.kernel.org, eranian@google.com, mingo@kernel.org, ak@linux.intel.com, davidcc@google.com, pjt@google.com, acme@redhat.com, hpa@zytor.com, mhiramat@kernel.org, tglx@linutronix.de, peterz@infradead.org, hekuang@huawei.com, sque@chromium.org, wangnan0@huawei.com, jolsa@kernel.org, alexander.shishkin@linux.intel.com Reply-To: eranian@google.com, linux-kernel@vger.kernel.org, davidcc@google.com, mingo@kernel.org, ak@linux.intel.com, sque@chromium.org, hekuang@huawei.com, mhiramat@kernel.org, peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, pjt@google.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, wangnan0@huawei.com In-Reply-To: <20170412064919.92449-3-davidcc@google.com> References: <20170412064919.92449-3-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build: Fix feature detection redefinion of build flags Git-Commit-ID: 9961aa665b70e47d6c80141c4a2482266010f246 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: 9961aa665b70e47d6c80141c4a2482266010f246 Gitweb: http://git.kernel.org/tip/9961aa665b70e47d6c80141c4a2482266010f246 Author: David Carrillo-Cisneros AuthorDate: Tue, 11 Apr 2017 23:49:14 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 13 Apr 2017 11:48:48 -0300 tools build: Fix feature detection redefinion of build flags This change is a follow up of https://lkml.org/lkml/2017/2/2/16 The patch above avoided redefining CC, CXX and PKG_CONFIG in feature detection. The patch was not merged due to a unsolved concern with the -MD flag. Later, commit c8c188679ccf ("tools build: Use the same CC for feature detection and actual build") did the change for CC and CXX but not PKG_CONFIG. This patch makes PKG_CONFIG consistent with CC and CXX and moves the -MD to CFLAGS, as suggested by Jiri in the thread above. Signed-off-by: David Carrillo-Cisneros Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170412064919.92449-3-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/feature/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 523e587..e35e4e5 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -53,17 +53,17 @@ FILES= \ FILES := $(addprefix $(OUTPUT),$(FILES)) -CC ?= $(CROSS_COMPILE)gcc -MD -CXX ?= $(CROSS_COMPILE)g++ -MD -PKG_CONFIG := $(CROSS_COMPILE)pkg-config +CC ?= $(CROSS_COMPILE)gcc +CXX ?= $(CROSS_COMPILE)g++ +PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config LLVM_CONFIG ?= llvm-config all: $(FILES) -__BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS) +__BUILD = $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS) BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1 -__BUILDXX = $(CXX) $(CXXFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS) +__BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS) BUILDXX = $(__BUILDXX) > $(@:.bin=.make.output) 2>&1 ###############################