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

mk: Add all external libs to sys_libs 



This allows us to better distinguish between external and internal libs.
This series is aimed at fixing github issue 434
Change-Id: I2ed141f909e7c4a800df02061007b0d23da25380
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/425434


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 fbb59928

examples/nvme/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 
APP = perf



ifeq ($(OS),Linux)

LIBS += -laio

SYS_LIBS += -laio

CFLAGS += -DHAVE_LIBAIO

endif

mk/nvme.libtest.mk

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ LIBS += $(SOCK_MODULES_LINKER_ARGS) 
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)



ifeq ($(CONFIG_RDMA),y)

LIBS += -libverbs -lrdmacm

SYS_LIBS += -libverbs -lrdmacm

endif



all: $(APP)

mk/spdk.common.mk

+5 −5
Original line number Diff line number Diff line
@@ -130,23 +130,23 @@ ifeq ($(OS),FreeBSD) 
ifeq ($(CONFIG_RDMA),y)

# RDMA Userspace Verbs Library

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

LIBS += -libverbs

SYS_LIBS += -libverbs

endif

# RDMA Connection Manager Library

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

LIBS += -lrdmacm

SYS_LIBS += -lrdmacm

endif

# Mellanox - MLX4 HBA Userspace Library

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

LIBS += -lmlx4

SYS_LIBS += -lmlx4

endif

# Mellanox - MLX5 HBA Userspace Library

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

LIBS += -lmlx5

SYS_LIBS += -lmlx5

endif

# Chelsio HBA Userspace Library

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

LIBS += -lcxgb4

SYS_LIBS += -lcxgb4

endif

endif

endif

test/app/stub/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) 
LIBS += $(ENV_LINKER_ARGS)



ifeq ($(CONFIG_RDMA),y)

LIBS += -libverbs -lrdmacm

SYS_LIBS += -libverbs -lrdmacm

endif



all : $(APP)

test/nvme/overhead/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 
APP = overhead



ifeq ($(OS),Linux)

LIBS += -laio

SYS_LIBS += -laio

CFLAGS += -DHAVE_LIBAIO

endif