From dfe9fa9beae1a22dd11fa8128498b6bb05b79a39 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 5 Dec 2016 10:35:00 -0700 Subject: [PATCH] env: do not link env lib with --whole-archive It is not necessary, and it prevents the linker from removing unused object files. Fix the iscsi_tgt Makefile's library order so that env is added at the end after the libraries that use it. Change-Id: I241eb46703c12691444037a350be65143259e82e Signed-off-by: Daniel Verkamp --- app/iscsi_tgt/Makefile | 2 +- lib/env_dpdk/env.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile index bce43538a..5e47fbc0d 100644 --- a/app/iscsi_tgt/Makefile +++ b/app/iscsi_tgt/Makefile @@ -49,10 +49,10 @@ C_SRCS := iscsi_tgt.c SPDK_LIB_LIST = jsonrpc json rpc bdev_rpc bdev iscsi scsi net copy trace conf SPDK_LIB_LIST += util log log_rpc event app_rpc -LIBS += $(ENV_LINKER_ARGS) LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) -lcrypto +LIBS += $(ENV_LINKER_ARGS) all : $(APP) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index 41fb18a47..b394113c2 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -74,4 +74,4 @@ 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 = -Wl,--start-group -Wl,--whole-archive $(ENV_LIBS) -Wl,--end-group -Wl,--no-whole-archive +ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--start-group -Wl,--whole-archive $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive