X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=1e6f9ecc6e0e48a1f3f25b80b17c8db03da9792c;hb=61717cc38;hp=3a5c80b52a918ac6f3030d70c8a1e5c8f7b5b7df;hpb=6e6968f06435727e6887abef4669715c9e59de6b;p=vpp.git

diff --git a/Makefile b/Makefile
index 3a5c80b52a9..1e6f9ecc6e0 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,11 @@ else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumblewee
 PKG=rpm
 endif
 
+# on ubuntu 18.04 prefer gcc-8 if it is installed and CC  is not set
+ifeq ($(OS_VERSION_ID)-$(CC)-$(shell which gcc-8 > /dev/null; echo $$?),18.04-cc-0)
+	CC = gcc-8
+endif
+
 # +libganglia1-dev if building the gmond plugin
 
 DEB_DEPENDS  = curl build-essential autoconf automake ccache
@@ -81,6 +86,7 @@ ifeq ($(OS_VERSION_ID),16.04)
 else ifeq ($(OS_VERSION_ID),18.04)
 	DEB_DEPENDS += python-dev
 	DEB_DEPENDS += libssl-dev
+	DEB_DEPENDS += gcc-8
 else ifeq ($(OS_VERSION_ID),20.04)
 	LIBFFI=libffi7
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -459,7 +465,7 @@ papi-wipe: test-wipe-papi
 
 .PHONY: test-wipe-papi
 test-wipe-papi:
-	@make -C test papi-wipe
+	@make -C test wipe-papi
 
 .PHONY: test-help
 test-help: