Commit 282bc167 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

build: ensure env deps are included when linking



The dependencies of the env library were not included when linking apps.
Right now, it isn't a big problem for env_dpdk, as it only depends on
log and util, which almost all other libraries also depend on, but it
has to be fixed if we ever needed to add more dependencies.

Reported-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I482845f74598d5525dc16d5e69e85db7fc4424f6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21873


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Reviewed-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent dca0da83
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@
# ENV_CXXFLAGS
# ENV_LIBS
# ENV_LINKER_ARGS
# ENV_DEPLIBS

include $(SPDK_ROOT_DIR)/mk/spdk.lib_deps.mk

DPDK_DIR = $(CONFIG_DPDK_DIR)

@@ -229,3 +232,4 @@ DPDK_LINKER_ARGS = $(DPDK_STATIC_LIB_LINKER_ARGS) $(DPDK_LDFLAGS)
ENV_LINKER_ARGS = $(ENV_DPDK_FILE) $(DPDK_LINKER_ARGS)
ENV_LINKER_ARGS += $(DPDK_PRIVATE_LINKER_ARGS)
endif
ENV_DEPLIBS += $(DEPDIRS-env_dpdk)
+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ define deplibs
$(call _uniq,$(call _deplibs,$1))
endef

SPDK_LIB_LIST += $(ENV_DEPLIBS)
SPDK_DEPLIB_LIST += $(call deplibs,$(SPDK_LIB_LIST))

SPDK_LIB_FILES = $(call spdk_lib_list_to_static_libs,$(SPDK_DEPLIB_LIST))