diff options
author | Lukas Wunner <lukas@wunner.de> | 2015-06-18 07:00:32 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-06-19 15:39:42 -0400 |
commit | 75e84ab906ef8935cff3df3d8929f1bafea81599 (patch) | |
tree | 72f29d9e086310d727b34f566591c84274dd6697 /tools | |
parent | 15c1247953e8a45232ed5a5540f291d2d0a77665 (diff) |
perf tools: Fix build breakage if prefix= is specified
Invoking Makefile.perf with prefix= breaks the build since Makefile.perf
hands that variable down to Makefile.build where it overrides
prefix := $(subst ./,,$(OUTPUT)$(dir)/)
leading to errors like this:
No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o'
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5
Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/build/Makefile.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index 10df57237a66..98cfc388ea33 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build | |||
@@ -94,12 +94,12 @@ obj-y := $(patsubst %/, %/$(obj)-in.o, $(obj-y)) | |||
94 | subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) | 94 | subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) |
95 | 95 | ||
96 | # '$(OUTPUT)/dir' prefix to all objects | 96 | # '$(OUTPUT)/dir' prefix to all objects |
97 | prefix := $(subst ./,,$(OUTPUT)$(dir)/) | 97 | objprefix := $(subst ./,,$(OUTPUT)$(dir)/) |
98 | obj-y := $(addprefix $(prefix),$(obj-y)) | 98 | obj-y := $(addprefix $(objprefix),$(obj-y)) |
99 | subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y)) | 99 | subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y)) |
100 | 100 | ||
101 | # Final '$(obj)-in.o' object | 101 | # Final '$(obj)-in.o' object |
102 | in-target := $(prefix)$(obj)-in.o | 102 | in-target := $(objprefix)$(obj)-in.o |
103 | 103 | ||
104 | PHONY += $(subdir-y) | 104 | PHONY += $(subdir-y) |
105 | 105 | ||