Commit 52b5c0d4 authored Jul 06, 2012 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Jul 25, 2012

tools lib traceevent: Detect build environment changes



Cross compiling perf requires setting ARCH and CROSS_COMPILE variables,
but libtraceevent couldn't detect the changes so it ends up believing no
recompiling is required. Thus the linker failed like:

     LINK perf
 ../lib/traceevent//libtraceevent.a: member ../lib/traceevent//libtraceevent.a(event-parse.o) in archive is not an object
 collect2: ld returned 1 exit status
 make: *** [perf] Error 1

This patch fixes this by adding TRACEEVENT-CFLAGS file like
PERF-CFLAGS to track those changes.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1341559297-25725-2-git-send-email-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 043d1a5c

tools/lib/traceevent/Makefile

+12 −2

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ libtraceevent.so: $(PEVENT_LIB_OBJS)
		libtraceevent.a: $(PEVENT_LIB_OBJS)
		$(Q)$(do_build_static_lib)

		$(PEVENT_LIB_OBJS): %.o: $(src)/%.c
		$(PEVENT_LIB_OBJS): %.o: $(src)/%.c TRACEEVENT-CFLAGS
		$(Q)$(do_fpic_compile)

		define make_version.h
		@@ -272,6 +272,16 @@ ifneq ($(dep_includes),)
		include $(dep_includes)
		endif

		### Detect environment changes
		TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE)

		TRACEEVENT-CFLAGS: force
		@FLAGS='$(TRACK_CFLAGS)'; \
		if test x"$$FLAGS" != x"`cat TRACEEVENT-CFLAGS 2>/dev/null`" ; then \
		echo 1>&2 " * new build flags or cross compiler"; \
		echo "$$FLAGS" >TRACEEVENT-CFLAGS; \
		fi

		tags: force
		$(RM) tags
		find . -name '*.[ch]' \| xargs ctags --extra=+f --c-kinds=+px \
		@@ -297,7 +307,7 @@ install: install_lib

		clean:
		$(RM) .o ~ $(TARGETS) .a .so $(VERSION_FILES) .*.d
		$(RM) tags TAGS
		$(RM) TRACEEVENT-CFLAGS tags TAGS

		endif # skip-makefile