From 40f3800480172bf0c0b4a2fe8df361b94ba7fb04 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 20 Nov 2018 15:24:09 -0700 Subject: [PATCH] build: remove ADDITIONAL_LIBS This can just be replaced with ENV_LIBS - similar to other application Makefiles. Signed-off-by: Jim Harris Change-Id: Icad14e6f74264389972c7798aac493e584f7c8c3 Reviewed-on: https://review.gerrithub.io/434280 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- mk/spdk.unittest.mk | 2 +- test/env/memory/Makefile | 1 - test/env/pci/Makefile | 1 - test/env/vtophys/Makefile | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk index 0f0fb9850..826cc3f13 100644 --- a/mk/spdk.unittest.mk +++ b/mk/spdk.unittest.mk @@ -53,7 +53,7 @@ endif all: $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ADDITIONAL_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(LINK_C) clean: diff --git a/test/env/memory/Makefile b/test/env/memory/Makefile index b6fb88e0e..1a9b208df 100644 --- a/test/env/memory/Makefile +++ b/test/env/memory/Makefile @@ -39,5 +39,4 @@ CFLAGS += $(ENV_CFLAGS) CFLAGS += -I$(SPDK_ROOT_DIR)/test/lib TEST_FILE = memory_ut.c -ADDITIONAL_LIBS += $(ENV_LIBS) include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/env/pci/Makefile b/test/env/pci/Makefile index 8b9697029..a0a371b8b 100644 --- a/test/env/pci/Makefile +++ b/test/env/pci/Makefile @@ -39,5 +39,4 @@ UNIT_TEST_LINK_ENV = 1 CFLAGS += $(ENV_CFLAGS) TEST_FILE = pci_ut.c -ADDITIONAL_LIBS += $(ENV_LIBS) include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk diff --git a/test/env/vtophys/Makefile b/test/env/vtophys/Makefile index 94eceae94..076fd2691 100644 --- a/test/env/vtophys/Makefile +++ b/test/env/vtophys/Makefile @@ -38,5 +38,4 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk UNIT_TEST_LINK_ENV = 1 TEST_FILE = vtophys.c -ADDITIONAL_LIBS += $(ENV_LIBS) include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk