From b6c6ef2958124fa548b7c2d5eb7c20736c885892 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 20 Nov 2018 15:11:50 -0700 Subject: [PATCH] build: add mk/spdk.app_vars.mk This is a step towards moving a lot of the boilerplate rules in various application Makefiles into mk/spdk.app.mk. We will need to add a mk/spdk.app_cxx.mk for our C++ applications, but that will need to share these same variables. Signed-off-by: Jim Harris Change-Id: Iaee73a4fa47ff2ee54f1a1ea3c0d2097900df218 Reviewed-on: https://review.gerrithub.io/434278 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- mk/spdk.app.mk | 18 +--------------- mk/spdk.app_vars.mk | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 mk/spdk.app_vars.mk diff --git a/mk/spdk.app.mk b/mk/spdk.app.mk index d1eb0bd3bd..6bafee330d 100644 --- a/mk/spdk.app.mk +++ b/mk/spdk.app.mk @@ -31,22 +31,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_LIB_FILES = $(call spdk_lib_list_to_static_libs,$(SPDK_LIB_LIST)) -SPDK_LIB_LINKER_ARGS = \ - -L$(SPDK_ROOT_DIR)/build/lib \ - -Wl,--whole-archive \ - $(SPDK_LIB_LIST:%=-lspdk_%) \ - -Wl,--no-whole-archive - -# This is primarily used for unit tests to ensure they link when shared library -# build is enabled. Shared libraries can't get their mock implementation from -# the unit test file. Note that even for unittests, we must include the mock -# library with whole-archive, to keep its functions from getting stripped out -# when LTO is enabled. -SPDK_STATIC_LIB_LINKER_ARGS = \ - $(SPDK_LIB_LIST:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a) \ - -Wl,--whole-archive \ - $(SPDK_ROOT_DIR)/build/lib/libspdk_ut_mock.a \ - -Wl,--no-whole-archive +include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk install: all diff --git a/mk/spdk.app_vars.mk b/mk/spdk.app_vars.mk new file mode 100644 index 0000000000..854a6a89de --- /dev/null +++ b/mk/spdk.app_vars.mk @@ -0,0 +1,50 @@ +# +# BSD LICENSE +# +# Copyright (c) Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +SPDK_LIB_FILES = $(call spdk_lib_list_to_static_libs,$(SPDK_LIB_LIST)) +SPDK_LIB_LINKER_ARGS = \ + -L$(SPDK_ROOT_DIR)/build/lib \ + -Wl,--whole-archive \ + $(SPDK_LIB_LIST:%=-lspdk_%) \ + -Wl,--no-whole-archive + +# This is primarily used for unit tests to ensure they link when shared library +# build is enabled. Shared libraries can't get their mock implementation from +# the unit test file. Note that even for unittests, we must include the mock +# library with whole-archive, to keep its functions from getting stripped out +# when LTO is enabled. +SPDK_STATIC_LIB_LINKER_ARGS = \ + $(SPDK_LIB_LIST:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a) \ + -Wl,--whole-archive \ + $(SPDK_ROOT_DIR)/build/lib/libspdk_ut_mock.a \ + -Wl,--no-whole-archive