aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-11-30 16:19:20 -0800
committerSteven Rostedt <rostedt@goodmis.org>2012-10-02 08:31:36 -0400
commit5bba4a0cf6fb6bad46ce4550583c62487fac7867 (patch)
treea1503bb6095e9f4b595c47298a8b3d288a8c3610
parent7594b96fc6bc053f8b3bf13ece1faad5d43a10e3 (diff)
downloadtrace-cmd-5bba4a0cf6fb6bad46ce4550583c62487fac7867.tar.gz
trace-cmd: Cross-compile fixes for LDFLAGS and include path
Add ability for the Makefile to respect LDFLAGS. Also remove hardcoded /usr/local/include include path. Link: http://lkml.kernel.org/r/4ED6C808.9030003@linux.intel.com Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 83c4f069..71402426 100644
--- a/Makefile
+++ b/Makefile
@@ -210,12 +210,13 @@ export Q VERBOSE
TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
+INCLUDES = -I. $(CONFIG_INCLUDES)
include features.mk
# Set compile option CFLAGS if not set elsewhere
CFLAGS ?= -g -Wall
+LDFLAGS ?=
ifndef NO_PTRACE
ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
@@ -259,7 +260,7 @@ do_fpic_compile = \
do_app_build = \
($(print_app_build) \
- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
+ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
do_compile_shared_library = \
($(print_shared_lib_compile) \
@@ -271,7 +272,7 @@ do_compile_plugin_obj = \
do_plugin_build = \
($(print_plugin_build) \
- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<)
do_build_static_lib = \
($(print_static_lib_build) \