From 4478bf8eadbd958acb9b301c14b069914ea0a2ba Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 26 Jul 2022 17:36:39 -0700 Subject: [PATCH] devops: fix WebKit Linux arm64 build (#15976) --- browser_patches/docker_build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser_patches/docker_build.sh b/browser_patches/docker_build.sh index de22c199cf..932397aae8 100755 --- a/browser_patches/docker_build.sh +++ b/browser_patches/docker_build.sh @@ -173,6 +173,8 @@ function ensure_docker_container { # Ubuntu 18.04 specific: install GCC-8. WebKit requires gcc 8.3+ to compile. apt-get install -y gcc-8 g++-8 + elif [[ "${BUILD_FLAVOR}" == webkit-*-arm64 ]]; then + apt-get install -y clang-12 fi git config --system user.email "you@example.com" @@ -198,7 +200,10 @@ elif [[ "$2" == "compile" ]]; then docker exec --user pwuser --workdir "/home/pwuser/playwright" ${DOCKER_ARGS} "${DOCKER_CONTAINER_NAME}" /bin/bash -c ' if [[ "${BUILD_FLAVOR}" == "webkit-ubuntu-18.04" ]]; then export CC=/usr/bin/gcc-8 - export CXX=/usr/bin/gcc++-8 + export CXX=/usr/bin/g++-8 + elif [[ "${BUILD_FLAVOR}" == webkit-*-arm64 ]]; then + export CC=/usr/bin/clang-12 + export CXX=/usr/bin/clang++-12 fi ./browser_patches/checkout_build_archive_upload.sh "${BUILD_FLAVOR}" '