[tip:perf/urgent] perf tools: Fix build breakage if prefix= is specified

From: tip-bot for Lukas Wunner
Date: Fri Jun 19 2015 - 19:10:02 EST

Commit-ID: 75e84ab906ef8935cff3df3d8929f1bafea81599
Gitweb: http://git.kernel.org/tip/75e84ab906ef8935cff3df3d8929f1bafea81599
Author: Lukas Wunner <lukas@xxxxxxxxx>
AuthorDate: Thu, 18 Jun 2015 13:00:32 +0200
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Fri, 19 Jun 2015 16:39:42 -0300

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@xxxxxxxxx>
Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5
Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@xxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
tools/build/Makefile.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index 10df572..98cfc38 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -94,12 +94,12 @@ obj-y := $(patsubst %/, %/$(obj)-in.o, $(obj-y))
subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y))

# '$(OUTPUT)/dir' prefix to all objects
-prefix := $(subst ./,,$(OUTPUT)$(dir)/)
-obj-y := $(addprefix $(prefix),$(obj-y))
-subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y))
+objprefix := $(subst ./,,$(OUTPUT)$(dir)/)
+obj-y := $(addprefix $(objprefix),$(obj-y))
+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y))

# Final '$(obj)-in.o' object
-in-target := $(prefix)$(obj)-in.o
+in-target := $(objprefix)$(obj)-in.o

PHONY += $(subdir-y)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/