From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756067AbbFSXKA (ORCPT ); Fri, 19 Jun 2015 19:10:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52648 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755969AbbFSXJx (ORCPT ); Fri, 19 Jun 2015 19:09:53 -0400 Date: Fri, 19 Jun 2015 16:09:29 -0700 From: tip-bot for Lukas Wunner Message-ID: Cc: acme@redhat.com, mingo@kernel.org, dsahern@gmail.com, jolsa@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, lukas@wunner.de Reply-To: linux-kernel@vger.kernel.org, lukas@wunner.de, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org, dsahern@gmail.com, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com> References: <5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Fix build breakage if prefix= is specified Git-Commit-ID: 75e84ab906ef8935cff3df3d8929f1bafea81599 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 75e84ab906ef8935cff3df3d8929f1bafea81599 Gitweb: http://git.kernel.org/tip/75e84ab906ef8935cff3df3d8929f1bafea81599 Author: Lukas Wunner AuthorDate: Thu, 18 Jun 2015 13:00:32 +0200 Committer: Arnaldo Carvalho de Melo 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 Acked-by: Jiri Olsa Cc: David Ahern Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5 Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com Signed-off-by: Arnaldo Carvalho de Melo --- 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/