matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: make tc linking depend on libtc.a 

There was a race condition where the command to link the tc binary
could (rarely) run before the libtc.a archive existed.
This commit is contained in:
David Michael 2017-01-03 15:32:46 -08:00 committed by Stephen Hemminger
parent 7f97744777
commit bb18c98198
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tc/Makefile
View File

@ -96,7 +96,7 @@ ifneq ($(TC_CONFIG_NO_XT),y)
endif endif
TCOBJ += $(TCMODULES) TCOBJ += $(TCMODULES)
LDLIBS += -L. -ltc -lm LDLIBS += -L. -lm
ifeq ($(SHARED_LIBS),y) ifeq ($(SHARED_LIBS),y)
LDLIBS += -ldl LDLIBS += -ldl
@ -124,13 +124,13 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@ $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
all: libtc.a tc $(TCSO) all: tc $(TCSO)
tc: $(TCOBJ) $(TCLIB) tc: $(TCOBJ) libtc.a
$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@ $(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
libtc.a: $(TCLIB) libtc.a: $(TCLIB)
$(QUIET_AR)$(AR) rcs $@ $(TCLIB) $(QUIET_AR)$(AR) rcs $@ $^
install: all install: all
mkdir -p $(MODDESTDIR) mkdir -p $(MODDESTDIR)