Add CC and CXX variables docker-compose

Also switch appimage workflow to clang for now (gcc breaks arm64 build)
MegaGlest · Jan 25, 2025 · f40e4da · f40e4da
1 parent 9a965a5
commit f40e4da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -42,18 +42,14 @@ jobs:
       - if: ${{ ! contains(matrix.platform, 'amd64') }}
         uses: docker/setup-qemu-action@v3
 
-      - name: Set variables
-        run: |
-          if [ -z "$VERSION" ]; then
-            echo "VERSION=snapshot" >> $GITHUB_ENV
-          fi
-
       - name: Build AppImage
         run: |
           export HOSTUID=$(id -u) HOSTGID=$(id -g)
           docker compose -f mk/linux/docker/docker-compose.yml run --rm build
         env:
           PLATFORM: ${{ matrix.platform }}
+          CC: clang
+          CXX: clang++
 
       - name: Create sha256sum
         run: |

diff --git a/mk/linux/build-appimage.sh b/mk/linux/build-appimage.sh
@@ -51,6 +51,7 @@ sudo DEBIAN_FRONTEND=noninteractive -i sh -c \
   apt upgrade -y &&
   apt install --no-install-recommends -y
     build-essential
+    $CC
     libcurl4-gnutls-dev
     libsdl2-dev
     libopenal-dev

diff --git a/mk/linux/docker/docker-compose.yml b/mk/linux/docker/docker-compose.yml
@@ -3,8 +3,10 @@ services:
     environment:
       HOSTUID: ${HOSTUID}
       HOSTGID: ${HOSTGID}
-      VERSION: ${VERSION}
+      VERSION: ${VERSION:-snapshot}
       WORKSPACE: ${WORKSPACE}
+      CC: "${CC:-gcc}"
+      CXX: "${CXX:-g++}"
     image: andy5995/linuxdeploy:v3-focal
     platform: ${PLATFORM}
     volumes: