lkml.org 
[lkml]   [2012]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf tools: Fix include order for bison/ flex-generated C files
    Commit-ID:  ed7e2c2ec59422b68b643c479a5816197620016e
    Gitweb: http://git.kernel.org/tip/ed7e2c2ec59422b68b643c479a5816197620016e
    Author: Ben Hutchings <ben@decadent.org.uk>
    AuthorDate: Mon, 20 Aug 2012 00:47:19 +0100
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 20 Aug 2012 09:36:41 -0300

    perf tools: Fix include order for bison/flex-generated C files

    When we use a separate output directory, we add util/ to the include
    path for the generated C files. However, this is currently added to the
    end of the path, behind /usr/include/slang and /usr/include/gtk-2.0 if
    use of the respective libraries is enabled. Thus the '#include
    "../perf.h"' in util/parse-events.l can actually include
    /usr/include/perf.h if it exists.

    Move '-Iutil/' ahead of all the other preprocessor options.

    Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Sedat Dilek <sedat.dilek@gmail.com>
    Link: http://lkml.kernel.org/r/1345420039.22400.80.camel@deadeye.wl.decadent.org.uk
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/Makefile | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 90cfecf..77e7ae3e 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -841,10 +841,10 @@ $(OUTPUT)perf.o perf.spec \
    # over the general rule for .o

    $(OUTPUT)util/%-flex.o: $(OUTPUT)util/%-flex.c $(OUTPUT)PERF-CFLAGS
    - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Iutil/ -w $<
    + $(QUIET_CC)$(CC) -o $@ -c -Iutil/ $(ALL_CFLAGS) -w $<

    $(OUTPUT)util/%-bison.o: $(OUTPUT)util/%-bison.c $(OUTPUT)PERF-CFLAGS
    - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Iutil/ -w $<
    + $(QUIET_CC)$(CC) -o $@ -c -Iutil/ $(ALL_CFLAGS) -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -w $<

    $(OUTPUT)%.o: %.c $(OUTPUT)PERF-CFLAGS
    $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $<

    \
     
     \ /
      Last update: 2012-08-21 20:01    [W:0.066 / U:31.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site