Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+4 -4
+4 -4
tools/build/Makefile.build
··· 94 94 subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) 95 95 96 96 # '$(OUTPUT)/dir' prefix to all objects 97 - prefix := $(subst ./,,$(OUTPUT)$(dir)/) 98 - obj-y := $(addprefix $(prefix),$(obj-y)) 99 - subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y)) 97 + objprefix := $(subst ./,,$(OUTPUT)$(dir)/) 98 + obj-y := $(addprefix $(objprefix),$(obj-y)) 99 + subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y)) 100 100 101 101 # Final '$(obj)-in.o' object 102 - in-target := $(prefix)$(obj)-in.o 102 + in-target := $(objprefix)$(obj)-in.o 103 103 104 104 PHONY += $(subdir-y) 105 105