From 4e55013952d66cd232622f6d2364e5ef60be1381 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Sun, 14 Aug 2022 23:25:26 -0700 Subject: [PATCH] devops(webkit): default to GCC-9 on Ubuntu 18.04 (#16531) --- browser_patches/docker/webkit/ubuntu-18.04.dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/browser_patches/docker/webkit/ubuntu-18.04.dockerfile b/browser_patches/docker/webkit/ubuntu-18.04.dockerfile index 64bec74fe1..bd6b505dbd 100644 --- a/browser_patches/docker/webkit/ubuntu-18.04.dockerfile +++ b/browser_patches/docker/webkit/ubuntu-18.04.dockerfile @@ -24,10 +24,12 @@ RUN apt purge --auto-remove cmake && \ apt-add-repository "deb https://apt.kitware.com/ubuntu/ bionic main" && \ apt-get update && apt-get install -y cmake -# Ubuntu 18.04 specific: default to gcc-8. Wbkit requires gcc 8.3+. -RUN apt-get install -y gcc-8 g++-8 -ENV CC=/usr/bin/gcc-8 -ENV CXX=/usr/bin/g++-8 +# Ubuntu 18.04 specific: default to gcc-9. +RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \ + apt-get update && \ + apt-get install gcc-9 g++-9 +ENV CC=/usr/bin/gcc-9 +ENV CXX=/usr/bin/g++-9 # Install Azure CLI RUN curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash