52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
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.
|
|
|
|
Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e]
|
|
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
|
|
|
|
---
|
|
Makefile | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
Index: git/Makefile
|
|
===================================================================
|
|
--- git.orig/Makefile
|
|
+++ git/Makefile
|
|
@@ -202,12 +202,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)
|
|
@@ -251,7 +252,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) \
|
|
@@ -263,7 +264,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) \
|