summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Varlese <marco.varlese@suse.com>2017-05-10 17:02:58 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2017-05-16 16:49:51 +0000
commitf73dae3c45b8fd8c0d9e26d386c56a90cfaf67fd (patch)
tree5807f4ce874f1da6c9dfdeabeb36581ec54397c5
parent93b503e1a445f327122276582b68205204a5d62e (diff)
Unneeded linking
Removed the linking which does not appear to be necessary when using in repo dpdk and which causes a build failure when using the shared-dpdk mode. Change-Id: I6bad2bd11d6db40fbd2def78f98c6beba66ff416 Signed-off-by: Marco Varlese <marco.varlese@suse.com>
-rw-r--r--src/plugins/dpdk.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 0b2425025dc..75bfb967af6 100644
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -14,7 +14,11 @@
vppapitestplugins_LTLIBRARIES += dpdk_test_plugin.la
vppplugins_LTLIBRARIES += dpdk_plugin.la
+if ENABLE_DPDK_SHARED
+dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -ldpdk
+else
dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
+endif
if WITH_DPDK_CRYPTO_SW
dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a
dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libisal_crypto.a,-l:libisal_crypto.a