Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64227379 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1df9fade

tools/build/Makefile.build

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ build-dir := $(srctree)/tools/build 
include $(build-dir)/Build.include



# do not force detected configuration

-include .config-detected

-include $(OUTPUT).config-detected



# Init all relevant variables used in build files so

# 1) they have correct type

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ config-clean: 
clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean

	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)

	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)$(RM) .config-detected

	$(Q)$(RM) $(OUTPUT).config-detected

	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32

	$(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*

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

tools/perf/config/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ ifneq ($(obj-perf),) 
obj-perf := $(abspath $(obj-perf))/

endif



$(shell echo -n > .config-detected)

detected     = $(shell echo "$(1)=y"       >> .config-detected)

detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected)

$(shell echo -n > $(OUTPUT).config-detected)

detected     = $(shell echo "$(1)=y"       >> $(OUTPUT).config-detected)

detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected)



CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)