From cceaeedb1f4d6e5e5fb7622d36190f1199f83b20 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 20 Nov 2018 15:14:14 -0700 Subject: [PATCH] build: add mk/spdk.app_cxx.mk This is just a copy of spdk.app.mk for now. But later patches will modify spdk.app.mk in a "C-specific" way, so add this cxx variant to use now in the C++ apps. Signed-off-by: Jim Harris Change-Id: I0d4d28c6119364d4c3cc7fa5274598b69f4ee6b1 Reviewed-on: https://review.gerrithub.io/434279 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- app/iscsi_top/Makefile | 2 +- app/trace/Makefile | 2 +- mk/spdk.app_cxx.mk | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 mk/spdk.app_cxx.mk diff --git a/app/iscsi_top/Makefile b/app/iscsi_top/Makefile index e4f9f573a..d0e0a727c 100644 --- a/app/iscsi_top/Makefile +++ b/app/iscsi_top/Makefile @@ -33,7 +33,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk CXXFLAGS += $(ENV_CXXFLAGS) CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib diff --git a/app/trace/Makefile b/app/trace/Makefile index 3d720d139..0466590c2 100644 --- a/app/trace/Makefile +++ b/app/trace/Makefile @@ -33,7 +33,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk CXX_SRCS := trace.cpp diff --git a/mk/spdk.app_cxx.mk b/mk/spdk.app_cxx.mk new file mode 100644 index 000000000..6bafee330 --- /dev/null +++ b/mk/spdk.app_cxx.mk @@ -0,0 +1,36 @@ +# +# 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. +# + +include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk + +install: all