Commit 3da58470 authored Nov 20, 2018 by Jim Harris Committed by Darek Stojaczyk Nov 28, 2018

build: add ENV_LINKER_ARGS to LINK_C and LINK_CXX



This allows us to remove $(ENV_LINKER_ARGS) from all of the
application Makefiles.

Modify spdk.unittest.mk to explicitly set ENV_LINKER_ARGS
to nothing, to avoid DPDK libraries from getting linked
into unit tests.  This seems better than creating separate
LINK_C rules for unit tests.  Provide a UNIT_TEST_LINK_ENV
flag to allow select unit tests to override this behavior -
it's needed for some of the env unit tests.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I647f2c848cf434023cf5a1f3a45869bbc4fc8102
Reviewed-on: https://review.gerrithub.io/434145


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

parent 80bfabcf

app/iscsi_tgt/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS)
		LIBS += $(SPDK_LIB_LINKER_ARGS)
		LIBS += $(ENV_LINKER_ARGS)

		all : $(APP)
		@:

app/nvmf_tgt/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ endif
		LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS) \
		$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
		$(SPDK_LIB_LINKER_ARGS)

		all : $(APP)
		@:

app/spdk_tgt/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ endif
		LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS) \
		$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
		$(SPDK_LIB_LINKER_ARGS)

		all: $(APP)
		@:

app/vhost/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
		$(COPY_MODULES_LINKER_ARGS) \
		$(SOCK_MODULES_LINKER_ARGS)
		LIBS += $(SPDK_LIB_LINKER_ARGS)
		LIBS += $(ENV_LINKER_ARGS)

		all : $(APP)
		@:

examples/bdev/fio_plugin/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ LDFLAGS += -shared -rdynamic
		SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace

		LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
		LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
		LIBS += $(SPDK_LIB_LINKER_ARGS)

		all: $(APP)
		@: