Commit ffc1d37c authored by Jim Harris's avatar Jim Harris
Browse files

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: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ib22a5016aa492c30a389a498ae0360fbcec7c12b

Reviewed-on: https://review.gerrithub.io/422439


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 3f38382c

mk/spdk.app.mk

+2 −2
Original line number Diff line number Diff line
@@ -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))