Skip to content
This repository was archived by the owner on Mar 25, 2026. It is now read-only.

Commit eae27ce

Browse files
committed
Use GCC 10 for Linux arm64 build to align environment with skiko
1 parent 0c06a0b commit eae27ce

3 files changed

Lines changed: 11 additions & 7 deletions

File tree

script/build.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,12 @@ def main():
6868
args += ['extra_cflags=["-stdlib=libc++", "-mmacosx-version-min=10.13"]']
6969
elif 'linux' == target:
7070
if 'arm64' == machine:
71-
# TODO: use clang on all targets!
7271
args += [
7372
'skia_gl_standard="gles"',
7473
'skia_use_egl=true',
75-
'extra_cflags_cc=["-fno-exceptions", "-fno-rtti", "-flax-vector-conversions=all", "-D_GLIBCXX_USE_CXX11_ABI=0"]',
76-
'cc="clang"',
77-
'cxx="clang++"',
74+
'extra_cflags_cc=["-fno-exceptions", "-fno-rtti", "-D_GLIBCXX_USE_CXX11_ABI=0", "-mno-outline-atomics"]',
75+
'cc="gcc-10"',
76+
'cxx="g++-10"',
7877
]
7978
else:
8079
args += [

script/prepare_linux.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ add-apt-repository ppa:ubuntu-toolchain-r/test -y
99
apt-get update -y
1010
apt-get install build-essential software-properties-common -y
1111
apt-get update
12+
1213
apt-get install gcc-10 g++-10 -y
1314
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10
1415
update-alternatives --config gcc

script/prepare_linux_arm.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ set -o errexit -o nounset -o pipefail
44
export DEBIAN_FRONTEND=noninteractive
55

66
apt-get update -y
7-
apt-get install binutils build-essential -y
8-
apt-get install software-properties-common -y
7+
apt-get install binutils build-essential software-properties-common -y
98
add-apt-repository ppa:git-core/ppa -y
9+
add-apt-repository ppa:ubuntu-toolchain-r/test -y
10+
apt-get update -y
1011
apt-get install git fontconfig libfontconfig1-dev libglu1-mesa-dev curl wget -y
11-
apt-get install clang -y
12+
13+
apt-get install gcc-10 g++-10 -y
14+
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10
15+
update-alternatives --config gcc
1216

1317
apt-get install python3.9 -y
1418
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 100

0 commit comments

Comments
 (0)