* [PATCH] perf make: Move DEBUG initialization into Makefile.perf
@ 2013-10-13 21:22 Jiri Olsa
2013-10-14 7:16 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Olsa @ 2013-10-13 21:22 UTC (permalink / raw)
To: linux-kernel
Cc: Jiri Olsa, Corey Ashford, David Ahern, Ingo Molnar, Namhyung Kim,
Paul Mackerras, Peter Zijlstra, Arnaldo Carvalho de Melo
Adding new top level Makefile invalidated the
DEBUG variable check for "command line" origin.
Moving this check into Makefile.perf.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Makefile | 6 +++++-
tools/perf/config/Makefile | 3 ---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 5aa3d04..db21dad 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -37,12 +37,16 @@ ifneq ($(O),)
FULL_O := $(shell readlink -f $(O))
endif
+ifeq ("$(origin DEBUG)", "command line")
+ D = $(DEBUG)
+endif
+
define print_msg
@printf ' BUILD: Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n'
endef
define make
- @$(MAKE) -f Makefile.perf --no-print-directory -j$(JOBS) O=$(FULL_O) $@
+ @$(MAKE) -f Makefile.perf --no-print-directory -j$(JOBS) O=$(FULL_O) PERF_DEBUG=$(D) $@
endef
#
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 9680424..912026a 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -66,9 +66,6 @@ ifneq ($(WERROR),0)
CFLAGS += -Werror
endif
-ifeq ("$(origin DEBUG)", "command line")
- PERF_DEBUG = $(DEBUG)
-endif
ifndef PERF_DEBUG
CFLAGS += -O6
endif
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] perf make: Move DEBUG initialization into Makefile.perf
2013-10-13 21:22 [PATCH] perf make: Move DEBUG initialization into Makefile.perf Jiri Olsa
@ 2013-10-14 7:16 ` Ingo Molnar
2013-10-14 8:03 ` Jiri Olsa
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2013-10-14 7:16 UTC (permalink / raw)
To: Jiri Olsa
Cc: linux-kernel, Corey Ashford, David Ahern, Ingo Molnar,
Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
* Jiri Olsa <jolsa@redhat.com> wrote:
> Adding new top level Makefile invalidated the
> DEBUG variable check for "command line" origin.
>
> Moving this check into Makefile.perf.
This ought to be fixed in my latest tip:tmp.perf branch. The fix commit in
particular is:
91a7b6db20ae tools/perf/build: Pass through DEBUG parameter
I'm waiting for Arnaldo to send an updated perf/core and then I will
double check whether any of the fixes is missing.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] perf make: Move DEBUG initialization into Makefile.perf
2013-10-14 7:16 ` Ingo Molnar
@ 2013-10-14 8:03 ` Jiri Olsa
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Olsa @ 2013-10-14 8:03 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Corey Ashford, David Ahern, Ingo Molnar,
Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
On Mon, Oct 14, 2013 at 09:16:11AM +0200, Ingo Molnar wrote:
>
> * Jiri Olsa <jolsa@redhat.com> wrote:
>
> > Adding new top level Makefile invalidated the
> > DEBUG variable check for "command line" origin.
> >
> > Moving this check into Makefile.perf.
>
> This ought to be fixed in my latest tip:tmp.perf branch. The fix commit in
> particular is:
>
> 91a7b6db20ae tools/perf/build: Pass through DEBUG parameter
>
> I'm waiting for Arnaldo to send an updated perf/core and then I will
> double check whether any of the fixes is missing.
ook, thanks
jirka
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-14 8:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-13 21:22 [PATCH] perf make: Move DEBUG initialization into Makefile.perf Jiri Olsa
2013-10-14 7:16 ` Ingo Molnar
2013-10-14 8:03 ` Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox