lkml.org 
[lkml]   [2012]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] perf: Fix include order for bison/flex-generated C files
    Em Mon, Aug 20, 2012 at 12:47:19AM +0100, Ben Hutchings escreveu:
    > 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.

    Thanks, applied

    > Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
    > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    > ---
    > tools/perf/Makefile | 4 ++--
    > 1 file changed, 2 insertions(+), 2 deletions(-)
    >
    > diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    > index 0eee64c..434175c 100644
    > --- a/tools/perf/Makefile
    > +++ b/tools/perf/Makefile
    > @@ -756,10 +756,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-20 15:21    [W:0.026 / U:31.500 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site