diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile index 21d5c8f04..573f56a03 100644 --- a/examples/nvme/perf/Makefile +++ b/examples/nvme/perf/Makefile @@ -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 diff --git a/mk/nvme.libtest.mk b/mk/nvme.libtest.mk index acaa13401..22cf38fa6 100644 --- a/mk/nvme.libtest.mk +++ b/mk/nvme.libtest.mk @@ -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) diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index 728b0f15a..2c150cf94 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -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 diff --git a/test/app/stub/Makefile b/test/app/stub/Makefile index 015a2e6e7..b4dd7463e 100644 --- a/test/app/stub/Makefile +++ b/test/app/stub/Makefile @@ -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) diff --git a/test/nvme/overhead/Makefile b/test/nvme/overhead/Makefile index 21dfe05f6..bcb7f38db 100644 --- a/test/nvme/overhead/Makefile +++ b/test/nvme/overhead/Makefile @@ -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