aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-06-20 20:56:46 -0400
committerDamjan Marion <damarion@cisco.com>2016-06-20 18:07:01 -0700
commit0977e4baabd97d1de711a3d7a0f285364a84159c (patch)
tree9e7b11f9b28103dd86330e74f7541fb570081fa5
parenta026eb1a6dafe8dcf50176bc68425e0789db22d3 (diff)
Fix problem with DPDK vector PMDs not working in VPP
Linker was picking wrong, weakly linked function from dpdk drivers, so detection of vector mode was always failing. Change-Id: I11725c8ddbc4604dd04ecb89ebb7f02ee05e52c7 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--vpp/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index 640c844b621..4c28fb795db 100644
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -71,11 +71,13 @@ vpp_LDADD += -lsvm -lsvmdb -lrt
vpp_LDADD += -lvnetplugin
if WITH_DPDK
+vpp_LDFLAGS = -Wl,--whole-archive
if ENABLE_DPDK_SHARED
-vpp_LDADD += -ldpdk
+vpp_LDFLAGS += -ldpdk
else
-vpp_LDADD += -l:libdpdk.a
+vpp_LDFLAGS += -l:libdpdk.a
endif
+vpp_LDFLAGS += -Wl,--no-whole-archive
endif
vpp_LDADD += -lvppinfra -lm -lpthread -ldl