d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ut_mock: rename library from spdk_mock to ut_mock

Browse Source 
This matches the lib/ut_mock directory name, and also
avoids the final library being named spdk_spdk_mock.a.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I80ec09568d0455d1f131e45694b6e2d536e6ca91

Reviewed-on: https://review.gerrithub.io/433909
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Jim Harris 2018-11-19 02:41:01 -07:00
parent 7962ce312d
commit f425b98513
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ut_mock/Makefile
View File

@ -35,6 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
C_SRCS = mock.c
LIBNAME = spdk_mock
LIBNAME = ut_mock
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

2
mk/spdk.app.mk
View File

@ -46,7 +46,7 @@ SPDK_LIB_LINKER_ARGS = \
SPDK_STATIC_LIB_LINKER_ARGS = \
$(SPDK_LIB_LIST:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a) \
-Wl,--whole-archive \
$(SPDK_ROOT_DIR)/build/lib/libspdk_spdk_mock.a \
$(SPDK_ROOT_DIR)/build/lib/libspdk_ut_mock.a \
-Wl,--no-whole-archive
install: all

2
shared_lib/Makefile
View File

@ -40,7 +40,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
SHARED_LINKED_LIB := $(SPDK_ROOT_DIR)/build/lib/libspdk.so
SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB).$(SO_SUFFIX_ALL)
IGNORED_LIBS := libspdk.so
IGNORED_LIBS += libspdk_spdk_mock.so
IGNORED_LIBS += libspdk_ut_mock.so
IGNORED_LIBS += libspdk_env_dpdk.so
SPDK_SHARED_LIBS := $(filter-out $(IGNORED_LIBS), $(sort $(notdir $(wildcard $(SPDK_ROOT_DIR)/build/lib/*.so))))