X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=bf9cfcc5344a80f661ecda15eaef37b0cadc2a7e;hb=f3783e15014c4c93a1b43697bfcc6422b0a7e369;hp=4a547b746f54c275b402769676851c91f662f629;hpb=4ba16a44b1f091bacc32fe6fa9f726e9a0d3b0e7;p=vpp.git

diff --git a/Makefile b/Makefile
index 4a547b746f5..bf9cfcc5344 100644
--- a/Makefile
+++ b/Makefile
@@ -59,11 +59,6 @@ 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
@@ -86,7 +81,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 clang-9
+	DEB_DEPENDS += clang-9
 else ifeq ($(OS_VERSION_ID),20.04)
 	LIBFFI=libffi7
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -132,7 +127,7 @@ else
 	RPM_DEPENDS += python36-ply  # for vppapigen
 	RPM_DEPENDS += python3-devel python3-pip
 	RPM_DEPENDS += python-virtualenv python36-jsonschema
-	RPM_DEPENDS += devtoolset-7
+	RPM_DEPENDS += devtoolset-9
 	RPM_DEPENDS += cmake3
 	RPM_DEPENDS_GROUPS = 'Development Tools'
 endif