From e5bf4f061acd04b22528a92cde2cda643962c89b Mon Sep 17 00:00:00 2001 From: Evgeniy Kochetov Date: Sun, 9 Feb 2020 10:01:12 +0000 Subject: [PATCH] make: Fix shared lib build Build with shared libraries fails if there is '.a' anywhere in the path to spdk, e.g. '/home/user/dir.auto/spdk'. 'subst' function in spdk.lib.mk is replaced with substitution reference, that alters only suffixes. Signed-off-by: Evgeniy Kochetov Change-Id: I5dd06ab95b85d5dd93becff001cef8e78daa0b81 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/669 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Seth Howell Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki --- mk/spdk.lib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk index a710179d0..50429fbe6 100644 --- a/mk/spdk.lib.mk +++ b/mk/spdk.lib.mk @@ -36,8 +36,8 @@ include $(SPDK_ROOT_DIR)/mk/spdk.lib_deps.mk SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/shared_lib/spdk.map LIB := $(call spdk_lib_list_to_static_libs,$(LIBNAME)) -SHARED_LINKED_LIB := $(subst .a,.so,$(LIB)) -SHARED_REALNAME_LIB := $(subst .so,.so.$(SO_SUFFIX_ALL),$(SHARED_LINKED_LIB)) +SHARED_LINKED_LIB := $(LIB:.a=.so) +SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB:.so=.so.$(SO_SUFFIX_ALL)) ifeq ($(CONFIG_SHARED),y) DEP := $(SHARED_LINKED_LIB)