From 0bfc0391d128c2f6c934cda4dc31e9668cf7b843 Mon Sep 17 00:00:00 2001 From: Maciej Szwed Date: Tue, 26 Jan 2021 15:01:30 +0100 Subject: [PATCH] event: Do not compile DPDK related code for non-DPDK env dpdk_governor (and therefore scheduler_dynamic) use DPDK env. It should not be compiled in non-DPDK env. Signed-off-by: Maciej Szwed Change-Id: I6b7cf15cf7383e6c1e77bfb188b24cabcc1f0fe1 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6102 Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins --- lib/event/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/event/Makefile b/lib/event/Makefile index 415c058ea..8da1c67a4 100644 --- a/lib/event/Makefile +++ b/lib/event/Makefile @@ -41,10 +41,15 @@ CFLAGS += $(ENV_CFLAGS) LIBNAME = event C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c log_rpc.c \ - app_rpc.c subsystem_rpc.c scheduler_static.c scheduler_dynamic.c + app_rpc.c subsystem_rpc.c scheduler_static.c +# Do not compile schedulers and governors based on DPDK env +# if non-DPDK env is used. +ENV_NAME := $(notdir $(CONFIG_ENV)) +ifeq ($(ENV_NAME),env_dpdk) ifeq ($(OS),Linux) -C_SRCS += gscheduler.c dpdk_governor.c +C_SRCS += gscheduler.c dpdk_governor.c scheduler_dynamic.c +endif endif SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_event.map)