From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 00/13] perf tools: Move perf subcommand framework into lib/tools
Date: Tue, 8 Dec 2015 09:27:08 -0600 [thread overview]
Message-ID: <20151208152708.GA14846@treble.redhat.com> (raw)
In-Reply-To: <20151208145531.GG11564@kernel.org>
On Tue, Dec 08, 2015 at 11:55:31AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Tue, Dec 08, 2015 at 11:52:33AM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Mon, Dec 07, 2015 at 09:46:48AM +0100, Jiri Olsa escreveu:
> > > On Sun, Dec 06, 2015 at 02:02:42PM -0600, Josh Poimboeuf wrote:
> > > > I think the problem is that you have a stale version of the
> > > > auto-generated file llvm-src-base.c. Looks like "make clean" doesn't
> > > > remove it. I'll add a patch to fix it.
>
> > > FYI I switched back to Arnaldo's perf/core and did 'make clean && make'
> > > which passed, then switched back to your change and build failed again
>
> > Even after his patches, it doesn't work, but I think this time he is not
> > taking $(OUTPUT) into account, and as I do use "O=/tmp/build/perf/" it
> > fails, trying to fix this...
>
> Nah, that was me not using O= for the 'make clean' call, after I do
> that, it works.
>
> But its sad everytime we introduce the need to run 'make clean' to
> regain a clean build environment :-\
Yeah, having to run 'make clean' every time you apply the patches is
less than ideal. The problem is that the Build file is also a source
file, since it generates the llvm-src-* files. I guess we could add the
Build file itself as a dependency, like:
diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index f8888e8..1869d73 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -35,21 +35,21 @@ perf-y += llvm.o llvm-src-base.o llvm-src-kbuild.o llvm-src-prologue.o
perf-y += bpf.o
perf-y += topology.o
-$(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c
+$(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
$(call rule_mkdir)
$(Q)echo '#include "tests/llvm.h"' > $@
$(Q)echo 'const char test_llvm__bpf_base_prog[] =' >> $@
$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
$(Q)echo ';' >> $@
-$(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c
+$(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c tests/Build
$(call rule_mkdir)
$(Q)echo '#include "tests/llvm.h"' > $@
$(Q)echo 'const char test_llvm__bpf_test_kbuild_prog[] =' >> $@
$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
$(Q)echo ';' >> $@
-$(OUTPUT)tests/llvm-src-prologue.c: tests/bpf-script-test-prologue.c
+$(OUTPUT)tests/llvm-src-prologue.c: tests/bpf-script-test-prologue.c tests/Build
$(call rule_mkdir)
$(Q)echo '#include "tests/llvm.h"' > $@
$(Q)echo 'const char test_llvm__bpf_test_prologue_prog[] =' >> $@
next prev parent reply other threads:[~2015-12-08 15:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-04 21:59 [PATCH 00/13] perf tools: Move perf subcommand framework into lib/tools Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 01/13] perf: Use -iquote for local include paths Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 02/13] perf: Split up util.h Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 03/13] perf: Move term functions out of util.c Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 04/13] perf: Remove unused pager_use_color variable Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 05/13] perf: Split up cache.h Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 06/13] perf: Remove cache.h Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 07/13] perf: Save cmdline arguments earlier Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 08/13] perf: Remove check for unused PERF_PAGER_IN_USE Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 09/13] perf: Move cmd_version() to builtin-version.c Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 10/13] perf: Move help_unknown_cmd() to its own file Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 11/13] perf tools: Move strlcpy() to tools/lib/string.c Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 12/13] perf tools: Move perf subcommand framework into a library Josh Poimboeuf
2015-12-04 22:21 ` [PATCH 12/13 v1.1] perf tools: Move tools/lib/string.c to libapi Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 13/13] perf tools: Move subcommand framework and related utils " Josh Poimboeuf
2015-12-06 9:37 ` [PATCH 00/13] perf tools: Move perf subcommand framework into lib/tools Ingo Molnar
2015-12-06 15:50 ` Jiri Olsa
2015-12-06 20:02 ` Josh Poimboeuf
2015-12-07 8:46 ` Jiri Olsa
2015-12-08 14:52 ` Arnaldo Carvalho de Melo
2015-12-08 14:55 ` Arnaldo Carvalho de Melo
2015-12-08 15:27 ` Josh Poimboeuf [this message]
2015-12-08 15:29 ` Arnaldo Carvalho de Melo
2015-12-08 15:41 ` Arnaldo Carvalho de Melo
2015-12-06 18:28 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151208152708.GA14846@treble.redhat.com \
--to=jpoimboe@redhat.com \
--cc=acme@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).