build: add ufc to SYS_LIBS in spdk.common.mk
This avoids duplicating it in several different Makefiles. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I85f4886ec6744c23639d24867e2c68757dfeba32 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4484 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com> Reviewed-by: <dongx.yi@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Reviewed-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
parent
10717b577c
commit
ec02743a4c
@ -49,11 +49,4 @@ ifeq ($(OS),Linux)
|
|||||||
SPDK_LIB_LIST += event_nbd
|
SPDK_LIB_LIST += event_nbd
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_FC),y)
|
|
||||||
ifneq ($(strip $(CONFIG_FC_PATH)),)
|
|
||||||
SYS_LIBS += -L$(CONFIG_FC_PATH)
|
|
||||||
endif
|
|
||||||
SYS_LIBS += -lufc
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
||||||
|
@ -54,13 +54,6 @@ SPDK_LIB_LIST += event_vhost
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_FC),y)
|
|
||||||
ifneq ($(strip $(CONFIG_FC_PATH)),)
|
|
||||||
SYS_LIBS += -L$(CONFIG_FC_PATH)
|
|
||||||
endif
|
|
||||||
SYS_LIBS += -lufc
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
||||||
|
|
||||||
install: $(APP)
|
install: $(APP)
|
||||||
|
@ -40,11 +40,4 @@ APP := nvmf
|
|||||||
C_SRCS := nvmf.c
|
C_SRCS := nvmf.c
|
||||||
SPDK_LIB_LIST = $(ALL_MODULES_LIST) event_bdev nvmf
|
SPDK_LIB_LIST = $(ALL_MODULES_LIST) event_bdev nvmf
|
||||||
|
|
||||||
ifeq ($(CONFIG_FC),y)
|
|
||||||
ifneq ($(strip $(CONFIG_FC_PATH)),)
|
|
||||||
SYS_LIBS += -L$(CONFIG_FC_PATH)
|
|
||||||
endif
|
|
||||||
SYS_LIBS += -lufc
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
||||||
|
@ -182,6 +182,13 @@ endif
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_FC),y)
|
||||||
|
ifneq ($(strip $(CONFIG_FC_PATH)),)
|
||||||
|
SYS_LIBS += -L$(CONFIG_FC_PATH)
|
||||||
|
endif
|
||||||
|
SYS_LIBS += -lufc
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_DEBUG), y)
|
ifeq ($(CONFIG_DEBUG), y)
|
||||||
COMMON_CFLAGS += -DDEBUG -O0 -fno-omit-frame-pointer
|
COMMON_CFLAGS += -DDEBUG -O0 -fno-omit-frame-pointer
|
||||||
else
|
else
|
||||||
|
@ -45,11 +45,4 @@ ifeq ($(OS),Linux)
|
|||||||
SPDK_LIB_LIST += event_nbd
|
SPDK_LIB_LIST += event_nbd
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_FC),y)
|
|
||||||
ifneq ($(strip $(CONFIG_FC_PATH)),)
|
|
||||||
SYS_LIBS += -L$(CONFIG_FC_PATH)
|
|
||||||
endif
|
|
||||||
SYS_LIBS += -lufc
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
||||||
|
Loading…
x
Reference in New Issue
Block a user