fix: linux builds: use gcc 10 in Linux builds (#4841)
This commit is contained in:
+7
-25
@@ -1,4 +1,7 @@
|
||||
# Configuration for cross-compiling using cross
|
||||
[build.env]
|
||||
passthrough = [ "CC" ]
|
||||
|
||||
[target.aarch64-unknown-linux-gnu]
|
||||
xargo = false
|
||||
pre-build = [
|
||||
@@ -11,15 +14,8 @@ pre-build = [
|
||||
pkg-config \
|
||||
libssl-dev:arm64 \
|
||||
libdbus-1-dev:arm64 \
|
||||
libxcb1-dev:arm64
|
||||
""",
|
||||
"""\
|
||||
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protoc-31.1-linux-x86_64.zip && \
|
||||
unzip -o protoc-31.1-linux-x86_64.zip -d /usr/local && \
|
||||
chmod +x /usr/local/bin/protoc && \
|
||||
ln -sf /usr/local/bin/protoc /usr/bin/protoc && \
|
||||
which protoc && \
|
||||
protoc --version
|
||||
libxcb1-dev:arm64 \
|
||||
gcc-10
|
||||
"""
|
||||
]
|
||||
|
||||
@@ -33,15 +29,8 @@ pre-build = [
|
||||
pkg-config \
|
||||
libssl-dev \
|
||||
libdbus-1-dev \
|
||||
libxcb1-dev
|
||||
""",
|
||||
"""\
|
||||
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protoc-31.1-linux-x86_64.zip && \
|
||||
unzip -o protoc-31.1-linux-x86_64.zip -d /usr/local && \
|
||||
chmod +x /usr/local/bin/protoc && \
|
||||
ln -sf /usr/local/bin/protoc /usr/bin/protoc && \
|
||||
which protoc && \
|
||||
protoc --version
|
||||
libxcb1-dev \
|
||||
gcc-10
|
||||
"""
|
||||
]
|
||||
|
||||
@@ -53,12 +42,5 @@ pre-build = [
|
||||
apt-get update && apt-get install -y \
|
||||
curl \
|
||||
unzip
|
||||
""",
|
||||
"""\
|
||||
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protoc-31.1-linux-x86_64.zip && \
|
||||
unzip protoc-31.1-linux-x86_64.zip -d /usr/local && \
|
||||
chmod +x /usr/local/bin/protoc && \
|
||||
export PROTOC=/usr/local/bin/protoc && \
|
||||
protoc --version
|
||||
"""
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user