trying to find clang

bbbradsmith · Apr 7, 2024 · e147796 · e147796
1 parent 15c88c1
commit e147796
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -254,15 +254,18 @@ jobs:
         uses: android-actions/setup-android@v3
       - name: Build SDL2 and zlib
         run: |
-          export CC=aarch64-linux-android26-clang
-          export AR=aarch64-linux-android26-clang-ar
+          export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/linux-x86_64
+          ls $TOOLCHAIN/bin
+          export CC="$TOOLCHAIN/bin/aarch64-linux-android26-clang"
+          export AR="$TOOLCHAIN/bin/$HOST-ar"
           make -f makefile.zlib
-          export RANLIB=aarch64-linux-android26-clang-ranlib
-          export CONFIGURE_FLAGS="--build=x86_64-linux --host=aarch64-linux-android --target=aarch64-linux-android26-clang"
+          export RANLIB="$TOOLCHAIN/bin/$HOST-ranlib"
+          export CONFIGURE_FLAGS="--build=x86_64-linux --host=aarch64-linux-android --target=$CC"
           make -f makefile.sdl
       - name: Build hatariB
         run: |
-          export CC=aarch64-linux-android26-clang
+          export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/linux-x86_64
+          export CC="$TOOLCHAIN/bin/aarch64-linux-android26-clang"
           export CMAKEFLAGS="-DCMAKE_SYSTEM_NAME=aarch64-linux-android"
           make
       - name: Prepare Artifact