summaryrefslogtreecommitdiffstats
path: root/tools/build
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 15:45:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 15:45:41 -0700
commit6bc4c3ad3619e1bcb4a6330e030007ace8ca465e (patch)
treedda9505c22e85417ee752ef90ff7848126cca0f0 /tools/build
parentc58267e9fa7b0345dd9006939254701e3622ca6a (diff)
parent0f02adaa49af23ab9fa05375f4a237da6014401b (diff)
downloadblackbird-op-linux-6bc4c3ad3619e1bcb4a6330e030007ace8ca465e.tar.gz
blackbird-op-linux-6bc4c3ad3619e1bcb4a6330e030007ace8ca465e.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "These are the left over fixes from the v4.1 cycle" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf tools: Fix build breakage if prefix= is specified perf/x86: Honor the architectural performance monitoring version perf/x86/intel: Fix PMI handling for Intel PT perf/x86/intel/bts: Fix DS area sharing with x86_pmu events perf/x86: Add more Broadwell model numbers perf: Fix ring_buffer_attach() RCU sync, again
Diffstat (limited to 'tools/build')
-rw-r--r--tools/build/Makefile.build8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index 69c35cf09cad..a51244a8022f 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)
OpenPOWER on IntegriCloud