fix: linux builds: use gcc 10 in Linux builds (#4841)

.github/workflows/build-cli.yml

@@ -35,11 +35,13 @@ jobs:
             target-suffix: unknown-linux-gnu
             build-on: ubuntu-latest
             use-cross: true
+            cc: gcc-10
           - os: ubuntu-latest
             architecture: aarch64
             target-suffix: unknown-linux-gnu
             build-on: ubuntu-latest
             use-cross: true
+            cc: gcc-10
           # macOS builds
           - os: macos-latest
             architecture: x86_64
@@ -123,8 +125,8 @@ jobs:
           echo "Cross version:"
           cross --version
 
-          echo "Building with explicit PROTOC path..."
+          export CC="${{ matrix.cc || ''}}"
-          cross build --release --target ${TARGET} -p goose-cli -vv
+          cross build --release --target ${TARGET} -p goose-cli
 
       - name: Build CLI (Windows)
         if: matrix.use-docker

.github/workflows/bundle-desktop-linux.yml

@@ -117,6 +117,7 @@ jobs:
           RUST_LOG: debug
           RUST_BACKTRACE: 1
           CROSS_VERBOSE: 1
+          CC: gcc-10
         run: |
           source ./bin/activate-hermit
           export TARGET="x86_64-unknown-linux-gnu"

Cross.toml

@@ -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
+     libxcb1-dev:arm64 \
-    """,
+     gcc-10
-    """\
-    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
     """
 ]
 
@@ -33,15 +29,8 @@ pre-build = [
      pkg-config \
      libssl-dev \
      libdbus-1-dev \
-     libxcb1-dev
+     libxcb1-dev \
-    """,
+     gcc-10
-    """\
-    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
     """
 ]
 
@@ -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
     """
 ]