On Wed, Jan 21, 2015 at 11:52:07AM -0700, David Ahern wrote:
> On 1/20/15 9:39 AM, Jiri Olsa wrote:
> >Move the rest of builtin objects (bench and test are
> >already in) building under build framework.
> >
> >Signed-off-by: Jiri Olsa <jo...@kernel.org>
> >Cc: Alexis Berlemont <alexis.berlem...@gmail.com>
> >Cc: Arnaldo Carvalho de Melo <a...@redhat.com>
> >Cc: Borislav Petkov <b...@alien8.de>
> >Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
> >Cc: David Ahern <dsah...@gmail.com>
> >Cc: Frederic Weisbecker <fweis...@gmail.com>
> >Cc: Ingo Molnar <mi...@kernel.org>
> >Cc: Namhyung Kim <namhy...@kernel.org>
> >Cc: Paul Mackerras <pau...@samba.org>
> >Cc: Peter Zijlstra <pet...@infradead.org>
> >Cc: Stephane Eranian <eran...@google.com>
> >---
> > tools/perf/Build | 29 +++++++++++++++++++++++++++++
> > tools/perf/Makefile.perf | 35 -----------------------------------
> > tools/perf/config/Makefile | 4 ++++
> > 3 files changed, 33 insertions(+), 35 deletions(-)
>
> This one fails to build:
>
> $ git --no-pager log --oneline -1
> cd2a9b144028 perf build: Add builtin objects building
>
> $ make O=/tmp/junk
> ...
> builtin-help.c:10:25: fatal error: common-cmds.h: No such file or directory
> compilation terminated.
> CC /tmp/junk/fs/fs.o
> CC /tmp/junk/builtin-script.o
> CC /tmp/junk/builtin-kmem.o
> CC /tmp/junk/perf-read-vdso32
> CC /tmp/junk/ui/gtk/browser.o
> CC /tmp/junk/fd/array.o
> CC /tmp/junk/ui/gtk/hists.o
> CC /tmp/junk/builtin-lock.o
> make[2]: *** [/tmp/junk/builtin-help.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
hum I can't reproduce, but I can see why
on the commit you mentioned there're foolowing dependencies:
$(PERF_IN): FORCE
@$(MAKE) $(build)=perf
$(OUTPUT)perf.o: perf.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS
$(QUIET_CC)$(CC) -include $(OUTPUT)PERF-VERSION-FILE \
'-DPERF_HTML_PATH="$(htmldir_SQ)"' \
$(CFLAGS) -c $(filter %.c,$^) -o $@
$(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) $(PERF_IN)
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(OUTPUT)perf.o \
$(BUILTIN_OBJS) $(PERF_IN) $(LIBS) -o $@
so $(OUTPUT)common-cmds.h gets build only for perf.o, while
it's needed before we dive in to $(PERF_IN) target..
this get's fixed later on within commit:
a07488a79e78 perf build: Add perf.o object building
where we have:
$(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE
$(Q)$(MAKE) $(build)=perf
I'll propagate the $(OUTPUT)common-cmds.h dependency to commit
cd2a9b144028 perf build: Add builtin objects building
like attached change
thanks for testing,
jirka
---
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index b0df3ec91104..061289d25fa8 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -550,7 +550,7 @@ PERF_IN := $(OUTPUT)perf-in.o
export srctree OUTPUT RM CC LD AR CFLAGS V
build := -f $(srctree)/tools/build/Makefile.build dir=. obj
-$(PERF_IN): FORCE
+$(PERF_IN): FORCE $(OUTPUT)common-cmds.h
@$(MAKE) $(build)=perf
$(OUTPUT)perf.o: perf.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
