Messages in this thread Patch in this message | | | From | Jiri Olsa <> | Subject | [PATCH] perf make: Move DEBUG initialization into Makefile.perf | Date | Sun, 13 Oct 2013 23:22:09 +0200 |
| |
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
| |