diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-10-04 06:08:05 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 02:49:01 -0400 |
commit | b102420b500da97e0fc18d94f0600bddeced1b99 (patch) | |
tree | 43c50f1adb40f3c1c4b04d73ba386f4eb70dcadb | |
parent | 684f434cc05a122938b75e055d7d799f1dd58d55 (diff) |
tools/perf/build: Fix non-canonical directory names in O=
This was a long-standing bug, relative pathnames like O=dir did not fully
work in the build system:
$ make O=localdir clean
SUBDIR Documentation
../../scripts/Makefile.include:3: *** O=localdir does not exist. Stop.
make[1]: *** [clean] Error 2
make: *** [clean] Error 2
Fix this by canonizing the directory before passing it to Makefile.perf.
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/n/tip-hchMp1hozn9tqgswWcooxcru@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | tools/perf/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 74f52d8f9631..9580ebe260e0 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -30,12 +30,19 @@ ifeq ($(JOBS),) | |||
30 | endif | 30 | endif |
31 | endif | 31 | endif |
32 | 32 | ||
33 | # | ||
34 | # Only pass canonical directory names as the output directory: | ||
35 | # | ||
36 | ifneq ($(O),) | ||
37 | FULL_O := $(shell readlink -f $(O)) | ||
38 | endif | ||
39 | |||
33 | define print_msg | 40 | define print_msg |
34 | @printf ' BUILD: Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n' | 41 | @printf ' BUILD: Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n' |
35 | endef | 42 | endef |
36 | 43 | ||
37 | define make | 44 | define make |
38 | @$(MAKE) -f Makefile.perf --no-print-directory -j$(JOBS) O=$(O) $@ | 45 | @$(MAKE) -f Makefile.perf --no-print-directory -j$(JOBS) O=$(FULL_O) $@ |
39 | endef | 46 | endef |
40 | 47 | ||
41 | # | 48 | # |