Commit 6c4f29bb authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

make: simplify rdma dependency linking 



Instead of adding the linker flags just before application compilation
on linux, move that linking to earlier in the process. This will also be
useful for the shared library build.
This series is aimed at fixing github issue 434
Change-Id: I84bcc6bd922ddb6e48adb2dfe0b154700773cf27
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/425435


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarLance Hartmann <lance.hartmann@oracle.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c58d3c44

mk/spdk.common.mk

+4 −8
Original line number Diff line number Diff line
@@ -125,17 +125,13 @@ LIBS += -L$(CONFIG_VPP_DIR)/lib64 
COMMON_CFLAGS += -I$(CONFIG_VPP_DIR)/include

endif



ifeq ($(CONFIG_RDMA),y)

SYS_LIBS += -libverbs -lrdmacm

endif



#Attach only if FreeBSD and RDMA is specified with configure

ifeq ($(OS),FreeBSD)

ifeq ($(CONFIG_RDMA),y)

# RDMA Userspace Verbs Library

ifneq ("$(wildcard /usr/lib/libibverbs.*)","")

SYS_LIBS += -libverbs

endif

# RDMA Connection Manager Library

ifneq ("$(wildcard /usr/lib/librdmacm.*)","")

SYS_LIBS += -lrdmacm

endif

# Mellanox - MLX4 HBA Userspace Library

ifneq ("$(wildcard /usr/lib/libmlx4.*)","")

SYS_LIBS += -lmlx4

test/app/stub/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -46,10 +46,6 @@ LIBS += $(SOCK_MODULES_LINKER_ARGS) 
LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += $(ENV_LINKER_ARGS)



ifeq ($(CONFIG_RDMA),y)

SYS_LIBS += -libverbs -lrdmacm

endif



all : $(APP)

	@: