lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCHv2 01/10] tools lib traceevent: Use LDFLAGS in the build commands
On Tue, Oct 16, 2018 at 11:21:36AM -0400, Steven Rostedt wrote:
> On Tue, 16 Oct 2018 17:06:06 +0200
> Jiri Olsa <jolsa@kernel.org> wrote:
>
> > So user could specify outside LDFLAGS values.
> >
> > Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> > tools/lib/traceevent/Makefile | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
> > index 0b4e833088a4..e535073c94ce 100644
> > --- a/tools/lib/traceevent/Makefile
> > +++ b/tools/lib/traceevent/Makefile
> > @@ -174,7 +174,7 @@ $(TE_IN): force
> > $(Q)$(MAKE) $(build)=libtraceevent
> >
> > $(OUTPUT)libtraceevent.so.$(EVENT_PARSE_VERSION): $(TE_IN)
> > - $(QUIET_LINK)$(CC) --shared $^ -Wl,-soname,libtraceevent.so.$(EP_VERSION) -o $@
> > + $(QUIET_LINK)$(CC) --shared $(LDFLAGS) $^ -Wl,-soname,libtraceevent.so.$(EP_VERSION) -o $@
> > @ln -sf $(@F) $(OUTPUT)libtraceevent.so
> > @ln -sf $(@F) $(OUTPUT)libtraceevent.so.$(EP_VERSION)
> >
> > @@ -193,7 +193,7 @@ $(PLUGINS_IN): force
> > $(Q)$(MAKE) $(build)=$(plugin_obj)
> >
> > $(OUTPUT)%.so: $(OUTPUT)%-in.o
> > - $(QUIET_LINK)$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $^
> > + $(QUIET_LINK)$(CC) -shared $(LDFLAGS) -nostartfiles -o $@ $^
>
>
> I'm guessing that the CFLAGS are not needed here, but shouldn't that
> also be mentioned in the change log?

yep, sry.. v2 attached

thanks,
jirka


---
So user could specify outside LDFLAGS values.

Also moving out CFLAGS from link command,
because it's not needed there.

Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/lib/traceevent/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 0b4e833088a4..e535073c94ce 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -174,7 +174,7 @@ $(TE_IN): force
$(Q)$(MAKE) $(build)=libtraceevent

$(OUTPUT)libtraceevent.so.$(EVENT_PARSE_VERSION): $(TE_IN)
- $(QUIET_LINK)$(CC) --shared $^ -Wl,-soname,libtraceevent.so.$(EP_VERSION) -o $@
+ $(QUIET_LINK)$(CC) --shared $(LDFLAGS) $^ -Wl,-soname,libtraceevent.so.$(EP_VERSION) -o $@
@ln -sf $(@F) $(OUTPUT)libtraceevent.so
@ln -sf $(@F) $(OUTPUT)libtraceevent.so.$(EP_VERSION)

@@ -193,7 +193,7 @@ $(PLUGINS_IN): force
$(Q)$(MAKE) $(build)=$(plugin_obj)

$(OUTPUT)%.so: $(OUTPUT)%-in.o
- $(QUIET_LINK)$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $^
+ $(QUIET_LINK)$(CC) -shared $(LDFLAGS) -nostartfiles -o $@ $^

define make_version.h
(echo '/* This file is automatically generated. Do not modify. */'; \
--
2.17.2
\
 
 \ /
  Last update: 2018-10-16 17:46    [W:0.071 / U:7.244 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site