git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mk: fix link to static combined library
[dpdk.git]
/
mk
/
rte.app.mk
diff --git
a/mk/rte.app.mk
b/mk/rte.app.mk
index
59468b0
..
40afb2c
100644
(file)
--- a/
mk/rte.app.mk
+++ b/
mk/rte.app.mk
@@
-61,6
+61,12
@@
ifeq ($(NO_AUTOLIBS),)
LDLIBS += --whole-archive
LDLIBS += --whole-archive
+ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y)
+LDLIBS += -l$(RTE_LIBNAME)
+endif
+
+ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)
+
ifeq ($(CONFIG_RTE_LIBRTE_DISTRIBUTOR),y)
LDLIBS += -lrte_distributor
endif
ifeq ($(CONFIG_RTE_LIBRTE_DISTRIBUTOR),y)
LDLIBS += -lrte_distributor
endif
@@
-119,8
+125,16
@@
LDLIBS += -lm
LDLIBS += -lrt
endif
LDLIBS += -lrt
endif
+endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS
+
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)
+LDLIBS += -lpcap
+endif
+
LDLIBS += --start-group
LDLIBS += --start-group
+ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)
+
ifeq ($(CONFIG_RTE_LIBRTE_KVARGS),y)
LDLIBS += -lrte_kvargs
endif
ifeq ($(CONFIG_RTE_LIBRTE_KVARGS),y)
LDLIBS += -lrte_kvargs
endif
@@
-149,15
+163,6
@@
ifeq ($(CONFIG_RTE_LIBRTE_RING),y)
LDLIBS += -lrte_ring
endif
LDLIBS += -lrte_ring
endif
-ifeq ($(CONFIG_RTE_LIBC),y)
-LDLIBS += -lc
-LDLIBS += -lm
-endif
-
-ifeq ($(CONFIG_RTE_LIBGLOSS),y)
-LDLIBS += -lgloss
-endif
-
ifeq ($(CONFIG_RTE_LIBRTE_EAL),y)
LDLIBS += -lrte_eal
endif
ifeq ($(CONFIG_RTE_LIBRTE_EAL),y)
LDLIBS += -lrte_eal
endif
@@
-195,6
+200,10
@@
LDLIBS += -lrte_vhost
LDLIBS += -lfuse
endif
LDLIBS += -lfuse
endif
+ifeq ($(CONFIG_RTE_LIBRTE_ENIC_PMD),y)
+LDLIBS += -lrte_pmd_enic
+endif
+
ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y)
LDLIBS += -lrte_pmd_i40e
endif
ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y)
LDLIBS += -lrte_pmd_i40e
endif
@@
-212,7
+221,7
@@
LDLIBS += -lrte_pmd_ring
endif
ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)
endif
ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)
-LDLIBS += -lrte_pmd_pcap
-lpcap
+LDLIBS += -lrte_pmd_pcap
endif
ifeq ($(CONFIG_RTE_LIBRTE_PMD_AF_PACKET),y)
endif
ifeq ($(CONFIG_RTE_LIBRTE_PMD_AF_PACKET),y)
@@
-221,6
+230,8
@@
endif
endif # plugins
endif # plugins
+endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS
+
LDLIBS += $(EXECENV_LDLIBS)
LDLIBS += --end-group
LDLIBS += $(EXECENV_LDLIBS)
LDLIBS += --end-group
@@
-244,16
+255,11
@@
build: _postbuild
exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-ifeq ($(RTE_BUILD_COMBINE_LIBS),y)
-LDLIBS += -l$(RTE_LIBNAME)
-endif
-
ifeq ($(LINK_USING_CC),1)
ifeq ($(LINK_USING_CC),1)
-LDLIBS := $(call linkerprefix,$(LDLIBS))
-LDFLAGS := $(call linkerprefix,$(LDFLAGS))
override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS))
O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \
override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS))
O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \
- -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDLIBS)
+ -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(call linkerprefix,$(LDFLAGS)) \
+ $(EXTRA_LDFLAGS) $(call linkerprefix,$(LDLIBS))
else
O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS)
else
O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS)