diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-11-07 11:32:16 +0100 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2020-08-12 12:46:12 +0000 |
| commit | 74331c935fd68d01757ff3af34c03cc8ca87faa0 (patch) | |
| tree | 87503e5aad763052268830048658d78f3d4c03ee /build-data | |
| parent | 5381da1dc6e5d28f644f5872127cf1ceaabf705d (diff) | |
build: use cmake build types
Type: make
Change-Id: If822c85d6ff26982516ea1d597ca81aa84773b2b
Signed-off-by: Damjan Marion <damarion@cisco.com>
(cherry picked from commit 2baa115da3b752cd7e44cc477f2c45bda22d444b)
Diffstat (limited to 'build-data')
| -rw-r--r-- | build-data/packages/vpp.mk | 5 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 31 |
2 files changed, 6 insertions, 30 deletions
diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 1b9e8a71e53..6571cd2cf09 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -25,10 +25,7 @@ vpp_cmake_prefix_path := $(subst $() $(),;,$(vpp_cmake_prefix_path)) 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 diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 11ffdacaf52..f71427c1ae6 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -22,29 +22,8 @@ endif 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 |