diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-20 01:07:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-20 01:07:02 +0200 |
| commit | 0f02adaa49af23ab9fa05375f4a237da6014401b (patch) | |
| tree | 77e2a9f9ca3e216dd1751de3878cd8c3246157fc | |
| parent | perf/x86: Honor the architectural performance monitoring version (diff) | |
| parent | perf tools: Fix build breakage if prefix= is specified (diff) | |
| download | linux-0f02adaa49af23ab9fa05375f4a237da6014401b.tar.xz linux-0f02adaa49af23ab9fa05375f4a237da6014401b.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fix from Arnaldo Carvalho de Melo:
- Fix build breakage if prefix= is specified, this introduced
a regression for a build idiom used by the Debian "linux-tools"
package, that does:
MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) ...
Fix it. (Lukas Wunner)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -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)) 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) |