Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1624604

[tip:perf/core] tools build: Fix feature detection redefinion of build flags

From tip-bot for David Carrillo-Cisneros <tipbot@zytor.com>
Newsgroups linux.kernel
Subject [tip:perf/core] tools build: Fix feature detection redefinion of build flags
Date 2017-04-17 10:50 +0200
Message-ID <txawa-6Xn-7@gated-at.bofh.it> (permalink)
References <tvkpY-1dW-27@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  9961aa665b70e47d6c80141c4a2482266010f246
Gitweb:     http://git.kernel.org/tip/9961aa665b70e47d6c80141c4a2482266010f246
Author:     David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Tue, 11 Apr 2017 23:49:14 -0700
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <davidcc@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170412064919.92449-3-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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
 
 ###############################

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] perf tool: build and usage hints David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 08:50 +0200
  [PATCH 1/6] perf tools: pass PYTHON config to feature detection David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 08:50 +0200
    [tip:perf/core] perf tools: Pass PYTHON config to feature detection tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  [PATCH 5/6] perf tools: disable JVMTI if no ELF support available David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 08:50 +0200
    Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support available Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:20 +0200
      [PATCH 5/6] perf tools: disable JVMTI if no ELF support available David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 19:10 +0200
        Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support available Jiri Olsa <jolsa@redhat.com> - 2017-04-12 19:40 +0200
          Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support available Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-13 16:50 +0200
        [tip:perf/core] perf tools: Disable JVMTI if no ELF support  available tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
    Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support  available Kim Phillips <kim.phillips@arm.com> - 2017-04-13 13:50 +0200
  [PATCH 2/6] tools build: fix feature redefine build flags David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    Re: [PATCH 2/6] tools build: fix feature redefine build flags Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:00 +0200
      Re: [PATCH 2/6] tools build: fix feature redefine build flags David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 18:40 +0200
        Re: [PATCH 2/6] tools build: fix feature redefine build flags Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-13 17:00 +0200
  [PATCH 4/6] perf report: hint .perfconfig error when invalid sorting key David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    Re: [PATCH 4/6] perf report: hint .perfconfig error when invalid  sorting key Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:20 +0200
      Re: [PATCH 4/6] perf report: hint .perfconfig error when invalid  sorting key David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 18:40 +0200
        Re: [PATCH 4/6] perf report: hint .perfconfig error when invalid  sorting key Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-13 17:00 +0200
  [PATCH 3/6] perf util: hint missing file when tool tips fail to load David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    [tip:perf/core] perf util: Hint missing file when tool tips fail to  load tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  [PATCH 2/6] tools build: fix feature detection redefinion of build flags David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    [tip:perf/core] tools build: Fix feature detection redefinion of  build flags tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  [PATCH 6/6] Revert "perf tools: Fix include of linux/mman.h" David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    [tip:perf/core] Revert "perf tools: Fix include of linux/mman.h" tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  Re: [PATCH 0/6] perf tool: build and usage hints Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:30 +0200

csiph-web