commit 2baa115da3b752cd7e44cc477f2c45bda22d444b
author Damjan Marion <damarion@cisco.com> Thu Nov 07 11:32:16 2019 +0100
committer Florin Coras <florin.coras@gmail.com> Fri Nov 08 22:57:47 2019 +0000
tree f149a9a4a24b0fa593ebcc0e46d2f39d11cb98e3
parent 972d71da8683259c238b3b0e69665655f2d35b70

build: use cmake build types

Type: make

Change-Id: If822c85d6ff26982516ea1d597ca81aa84773b2b
Signed-off-by: Damjan Marion <damarion@cisco.com>

build-data/packages/vpp.mk

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 1b9e8a7..6571cd2 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -25,10 +25,7 @@
 
 vpp_cmake_args ?=
 vpp_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR)
-vpp_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)"
-vpp_cmake_args += -DCMAKE_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)"
-vpp_cmake_args += -DCMAKE_EXE_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)"
-vpp_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)"
+vpp_cmake_args += -DCMAKE_BUILD_TYPE="$($(TAG)_TAG_BUILD_TYPE)"
 vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(vpp_cmake_prefix_path)"
 ifeq ("$(V)","1")
 vpp_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

build-data/platforms/vpp.mk

diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 11ffdac..f71427c 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -22,29 +22,8 @@
 
 vpp_root_packages = vpp vom
 
-vpp_common_cflags = \
-	-g \
-	-DFORTIFY_SOURCE=2 \
-	-fstack-protector \
-	-fPIC \
-	-Wall \
-	-Werror \
-	-fno-common
-
-vpp_debug_TAG_CFLAGS = -O0 -DCLIB_DEBUG $(vpp_common_cflags)
-vpp_debug_TAG_CXXFLAGS = -O0 -DCLIB_DEBUG $(vpp_common_cflags)
-vpp_debug_TAG_LDFLAGS = -O0 -DCLIB_DEBUG $(vpp_common_cflags)
-
-vpp_TAG_CFLAGS = -O2 $(vpp_common_cflags)
-vpp_TAG_CXXFLAGS = -O2 $(vpp_common_cflags)
-vpp_TAG_LDFLAGS = -O2 $(vpp_common_cflags) -pie
-
-vpp_clang_TAG_CFLAGS = -O2 $(vpp_common_cflags)
-vpp_clang_TAG_CXXFLAGS = -O2 $(vpp_common_cflags)
-vpp_clang_TAG_LDFLAGS = -O2 $(vpp_common_cflags)
-
-vpp_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DCLIB_GCOV -fPIC -Werror -fprofile-arcs -ftest-coverage
-vpp_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DCLIB_GCOV -fPIC -Werror -coverage
-
-vpp_coverity_TAG_CFLAGS = -g -O2 -fPIC -Werror -D__COVERITY__
-vpp_coverity_TAG_LDFLAGS = -g -O2 -fPIC -Werror -D__COVERITY__
+vpp_debug_TAG_BUILD_TYPE = debug
+vpp_TAG_BUILD_TYPE = release
+vpp_clang_TAG_BUILD_TYPE = release
+vpp_gcov_TAG_BUILD_TYPE = gcov
+vpp_coverity_TAG_BUILD_TYPE = coverity