On Wed, Jul 01, 2015 at 02:54:42PM +0300, Aaro Koskinen wrote: > 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 <[email protected]>
Acked-by: Jiri Olsa <[email protected]> thanks, jirka > --- > tools/build/Makefile.build | 2 +- > tools/perf/Makefile.perf | 2 +- > tools/perf/config/Makefile | 6 +++--- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build > index 69c35cf..7ebd35a 100644 > --- a/tools/build/Makefile.build > +++ b/tools/build/Makefile.build > @@ -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 > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index c43a205..14e823f 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -528,7 +528,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 > diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile > index 59a98c6..3440fc1 100644 > --- a/tools/perf/config/Makefile > +++ b/tools/perf/config/Makefile > @@ -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) > > -- > 2.4.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
