diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-12-17 17:21:41 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-01-03 17:08:11 +0400 |
commit | cb14ab6061e9defe0ae9e784654e375949d336a7 (patch) | |
tree | 448cb89756c8f2b4cbedf7f9c45e0e1c1e47fa50 | |
parent | 5ed310e9182a313eee6bf3268bc960719390527f (diff) |
perf: Pass only required cflags from perf to libtraceevent
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r-- | tools/lib/traceevent/Makefile | 1 | ||||
-rw-r--r-- | tools/perf/Makefile | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 04d959fa022..3634ce0204c 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -130,6 +130,7 @@ CFLAGS ?= -g -Wall # Append required CFLAGS override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) override CFLAGS += $(udis86-flags) -D_GNU_SOURCE +override CFLAGS += $(ANDROID_CFLAGS) ifeq ($(VERBOSE),1) Q = diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 16d4c64d971..efd3e801f3a 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -501,7 +501,8 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y) ifeq ($(call try-cc,$(SOURCE_BIONIC),$(FLAGS_GLIBC)),y) # Found Bionic instead of glibc... # That works too, but needs a bit of special treatment - BASIC_CFLAGS += -DANDROID -DHAVE_STRLCPY -include $(CURDIR)/compat-android.h + ANDROID_CFLAGS := -DANDROID -DHAVE_STRLCPY -include $(CURDIR)/compat-android.h + BASIC_CFLAGS += $(ANDROID_CFLAGS) ANDROID := 1 else msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static); @@ -958,7 +959,7 @@ $(LIB_FILE): $(LIB_OBJS) # libtraceevent.a $(LIBTRACEEVENT): - $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) VERBOSE=2 CFLAGS="$(ALL_CFLAGS)" O=$(OUTPUT) libtraceevent.a + $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) ANDROID_CFLAGS="$(ANDROID_CFLAGS)" O=$(OUTPUT) libtraceevent.a $(LIBTRACEEVENT)-clean: $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) clean |