X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms%2Fvpp.mk;h=10184964e2308f55578de17121fa8ff945071ce4;hb=aefbedeb5da326475230c31e75d0d9d6d0de8656;hp=0687946dbb930a81a9dee457c6cbb7565bb57ba0;hpb=cc4a5e8089967f0c266e9c5ed319c38c111004cd;p=vpp.git

diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 0687946dbb9..10184964e23 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -19,33 +19,9 @@ vpp_arch = native
 ifeq ($(TARGET_PLATFORM),thunderx)
 vpp_dpdk_target = arm64-thunderx-linuxapp-gcc
 endif
-vpp_native_tools = vppapigen
-
-vpp_uses_dpdk = yes
-
-# Uncoment to enable building unit tests
-# vpp_enable_tests = yes
 
 vpp_root_packages = vpp vom japi
 
-# DPDK configuration parameters
-# vpp_uses_dpdk_mlx4_pmd = yes
-# vpp_uses_dpdk_mlx5_pmd = yes
-# vpp_uses_external_dpdk = yes
-# vpp_dpdk_inc_dir = /usr/include/dpdk
-# vpp_dpdk_lib_dir = /usr/lib
-# vpp_dpdk_shared_lib = yes
-
-# Use '--without-libnuma' for non-numa aware architecture
-# Use '--enable-dlmalloc' to use dlmalloc instead of mheap
-vpp_configure_args_vpp = --enable-dlmalloc
-sample-plugin_configure_args_vpp = --enable-dlmalloc
-
-# load balancer plugin is not portable on 32 bit platform
-ifeq ($(MACHINE),i686)
-vpp_configure_args_vpp += --disable-lb-plugin
-endif
-
 vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
 	-fstack-protector-all -fPIC -Werror
 vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \
@@ -58,6 +34,7 @@ vpp_TAG_CXXFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
 vpp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror -pie -Wl,-z,now
 
 vpp_clang_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
+vpp_clang_TAG_CXXFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
 vpp_clang_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror
 
 vpp_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -fPIC -Werror -fprofile-arcs -ftest-coverage