From ffc1d37c53bb9ea37315f5102db381a58095d0b3 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 15 Aug 2018 09:26:37 -0700 Subject: [PATCH] spdk.app.mk: fix SPDK_FILTER_LIB_LIST When we build the SPDK_FILTER_LIB_LIST, we should maintain the dependencies between libraries. Primary culprit is vhost depending on scsi. So add vhost to SPDK_FILTER_LIB_LIST before scsi, and then stop sorting the list unnecessarily before using it. Signed-off-by: Jim Harris Change-Id: Ib22a5016aa492c30a389a498ae0360fbcec7c12b Reviewed-on: https://review.gerrithub.io/422439 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker Chandler-Test-Pool: SPDK Automated Test System --- mk/spdk.app.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/spdk.app.mk b/mk/spdk.app.mk index 66ece2b0f..a046eada1 100644 --- a/mk/spdk.app.mk +++ b/mk/spdk.app.mk @@ -45,14 +45,14 @@ SPDK_FILTER_LIB_LIST += $(filter %_rpc,$(SPDK_LIB_LIST)) SPDK_FILTER_LIB_LIST += $(filter iscsi,$(SPDK_LIB_LIST)) SPDK_FILTER_LIB_LIST += $(filter nbd,$(SPDK_LIB_LIST)) SPDK_FILTER_LIB_LIST += $(filter net,$(SPDK_LIB_LIST)) -SPDK_FILTER_LIB_LIST += $(filter scsi,$(SPDK_LIB_LIST)) SPDK_FILTER_LIB_LIST += $(filter vhost,$(SPDK_LIB_LIST)) +SPDK_FILTER_LIB_LIST += $(filter scsi,$(SPDK_LIB_LIST)) # The unit test mock wrappers need to be wrapped in whole-archive so they don't get # automatically removed with LTO. SPDK_FILTER_LIB_LIST += $(filter spdk_mock,$(SPDK_LIB_LIST)) -SPDK_WHOLE_ARCHIVE_LIB_LIST = $(sort $(SPDK_FILTER_LIB_LIST)) +SPDK_WHOLE_ARCHIVE_LIB_LIST = $(SPDK_FILTER_LIB_LIST) SPDK_REMAINING_LIB_LIST = $(filter-out $(SPDK_WHOLE_ARCHIVE_LIB_LIST),$(SPDK_LIB_LIST)) SPDK_LIB_FILES = $(call spdk_lib_list_to_files,$(SPDK_LIB_LIST))