Re: [PATCH 00/13] perf tools: Move perf subcommand framework into lib/tools

[Josh Poimboeuf]

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[] =' >> $@

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/