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

perf tools: Create config.detected into OUTPUT directory

Create config.detected into OUTPUT directory instead of source
directory.

This fixes parallel builds that share the same source directory.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1435751683-18500-1-git-send-email-aaro.koskinen@nokia.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Aaro Koskinen and committed by
Arnaldo Carvalho de Melo
64227379 1df9fade

+5 -5
+1 -1
tools/build/Makefile.build
··· 25 25 include $(build-dir)/Build.include 26 26 27 27 # do not force detected configuration 28 - -include .config-detected 28 + -include $(OUTPUT).config-detected 29 29 30 30 # Init all relevant variables used in build files so 31 31 # 1) they have correct type
+1 -1
tools/perf/Makefile.perf
··· 545 545 clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean 546 546 $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) 547 547 $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 548 - $(Q)$(RM) .config-detected 548 + $(Q)$(RM) $(OUTPUT).config-detected 549 549 $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 550 550 $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* 551 551 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
+3 -3
tools/perf/config/Makefile
··· 11 11 obj-perf := $(abspath $(obj-perf))/ 12 12 endif 13 13 14 - $(shell echo -n > .config-detected) 15 - detected = $(shell echo "$(1)=y" >> .config-detected) 16 - detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected) 14 + $(shell echo -n > $(OUTPUT).config-detected) 15 + detected = $(shell echo "$(1)=y" >> $(OUTPUT).config-detected) 16 + detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) 17 17 18 18 CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) 19 19