From 26037aa3b0edb20733e2573bf491c5175136641c Mon Sep 17 00:00:00 2001 From: Mike Gerdts Date: Mon, 27 Mar 2023 00:00:13 -0500 Subject: [PATCH] accel: allow libisal and libisal_crypto If CONFIG_ISAL and CONFIG_ISAL_CRYPTO are both defined, the build was only including the LOCAL_SYS_LIBS for libisal_crypto. This fixes that bug using the same technique used in other Makeifles. Signed-off-by: Mike Gerdts Change-Id: I4c0869d60742cd6bdb0812d67db3abbfa7e69122 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17345 Reviewed-by: Aleksey Marchuk Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Jim Harris --- lib/accel/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/accel/Makefile b/lib/accel/Makefile index c50e29046..8d76e7a3e 100644 --- a/lib/accel/Makefile +++ b/lib/accel/Makefile @@ -14,12 +14,14 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) LIBNAME = accel C_SRCS = accel.c accel_rpc.c accel_sw.c +LOCAL_SYS_LIBS = + ifeq ($(CONFIG_ISAL), y) -LOCAL_SYS_LIBS = -L$(ISAL_DIR)/.libs -lisal +LOCAL_SYS_LIBS += -L$(ISAL_DIR)/.libs -lisal endif ifeq ($(CONFIG_ISAL_CRYPTO), y) -LOCAL_SYS_LIBS = -L$(ISAL_CRYPTO_DIR)/.libs -lisal_crypto +LOCAL_SYS_LIBS += -L$(ISAL_CRYPTO_DIR)/.libs -lisal_crypto endif SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_accel.map)