From bc7b070deb213968dd3116bea916100bc399b2d7 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 25 Jan 2017 17:19:05 -0700 Subject: [PATCH] env_dpdk: move system libraries out of ENV_LIBS The $(ENV_LIBS) variable was including system library linker arguments like '-ldl', but $(ENV_LIBS) is intended to be used as a dependency for other Makefile targets, and those arguments don't belong there. Add the system library linker arguments to ENV_LINKER_ARGS instead. Change-Id: I247264d287047f1423365806042982b492eec311 Signed-off-by: Daniel Verkamp --- lib/env_dpdk/env.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index b394113c2..0116b321c 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -63,15 +63,15 @@ ifneq ($(wildcard $(DPDK_ABS_DIR)/lib/librte_malloc.*),) DPDK_LIB += $(DPDK_ABS_DIR)/lib/librte_malloc.a endif -ifeq ($(OS),Linux) -DPDK_LIB += -ldl -endif -ifeq ($(OS),FreeBSD) -DPDK_LIB += -lexecinfo -endif - ENV_CFLAGS = $(DPDK_INC) ENV_CXXFLAGS = $(ENV_CFLAGS) ENV_DPDK_FILE = $(call spdk_lib_list_to_files,env_dpdk) ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB) ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--start-group -Wl,--whole-archive $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive + +ifeq ($(OS),Linux) +ENV_LINKER_ARGS += -ldl +endif +ifeq ($(OS),FreeBSD) +ENV_LINKER_ARGS += -lexecinfo +endif