Commit 8f71ab3a authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

mk: use the env shared lib when linking apps 



Previously, aplications were always being linked against the
spdk_env_dpdk.a file even during the shared object build. Change this to
be consistent with our linking.

Also, the old behavior causes issues with resolving symbols in FreeBSD.

Change-Id: I96e2e6044c16e7579cff35ad46e3688ce6fa2b5a
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464733


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent e29c6fe1

lib/env_dpdk/env.mk

+4 −0
Original line number Diff line number Diff line
@@ -114,7 +114,11 @@ DPDK_LIB = $(DPDK_LIB_LIST:%=$(DPDK_ABS_DIR)/lib/lib%$(DPDK_LIB_EXT)) 
# SPDK memory registration requires experimental (deprecated) rte_memory API for DPDK 18.05

ENV_CFLAGS = $(DPDK_INC) -Wno-deprecated-declarations

ENV_CXXFLAGS = $(ENV_CFLAGS)

ifeq ($(CONFIG_SHARED),y)

ENV_DPDK_FILE = $(call spdk_lib_list_to_shared_libs,env_dpdk)

else

ENV_DPDK_FILE = $(call spdk_lib_list_to_static_libs,env_dpdk)

endif

ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB)

ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--whole-archive,--no-as-needed $(DPDK_LIB) -Wl,--no-whole-archive