CI: Try to fix macOS build

Author: radioactiveman

.github/actions/install-dependencies/action.yml

@@ -16,6 +16,9 @@ runs:
     - run: '$GITHUB_ACTION_PATH/install-dependencies.sh "${{ inputs.os }}" "${{ inputs.build-system }}"'
       if: (!startsWith(inputs.os, 'windows'))
       shell: bash
+      env:
+        CC: clang
+        CXX: clang++
 
     - uses: msys2/setup-msys2@v2
       if: startsWith(inputs.os, 'windows')

.github/actions/run-action/action.yml

@@ -19,6 +19,9 @@ runs:
     - run: '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}" "${{ inputs.build-system }}"'
       if: (!startsWith(inputs.os, 'windows'))
       shell: bash
+      env:
+        CC: clang
+        CXX: clang++
 
     - run: '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}" "${{ inputs.build-system }}"'
       if: startsWith(inputs.os, 'windows')

.github/actions/run-action/run-action.sh

@@ -47,7 +47,7 @@ case "$action" in
         if [ "$build_system" = 'meson' ]; then
           meson setup build -D qt5=true -D gtk=false -D mac-media-keys=true
         else
-          ./autogen.sh && ./configure --enable-qt5 --disable-gtk --enable-mac-media-keys
+          autoreconf -I "/usr/local/share/gettext/m4" && ./configure --enable-qt5 --disable-gtk --enable-mac-media-keys
         fi
         ;;
 
@@ -58,7 +58,13 @@ case "$action" in
         if [ "$build_system" = 'meson' ]; then
           meson setup build -D gtk=false -D mac-media-keys=true
         else
-          ./autogen.sh && ./configure --disable-gtk --enable-mac-media-keys
+          brew remove gcc@12
+          brew remove gcc@13
+          brew remove gcc@14
+
+          export LDFLAGS="-L/opt/homebrew/opt/libiconv/lib"
+          export CPPFLAGS="-I/opt/homebrew/opt/libiconv/include"
+          autoreconf -I "/opt/homebrew/opt/gettext/share/gettext/m4" && ./configure --disable-gtk --enable-mac-media-keys
         fi
         ;;
 

.github/workflows/c-cpp.yml

@@ -10,13 +10,8 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04,
-             macos-13, macos-15,
-             windows-2022]
-        build-system: [autotools, meson]
-        exclude:
-          - os: macos-15
-            build-system: autotools
+        os: [macos-15]
+        build-system: [autotools]
       fail-fast: false
     runs-on: ${{ matrix.os }}
 

acinclude.m4

@@ -101,13 +101,7 @@ AC_REQUIRE([AC_SYS_LARGEFILE])
 
 if test "x$GCC" = "xyes"; then
     CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
-    CXXFLAGS="$CXXFLAGS -ffast-math -Wall -pipe"
-
-    # use C++17 if possible (Qt 6 requires it)
-    AUD_CHECK_CXXFLAGS(-std=gnu++17)
-    if test "${CXXFLAGS%gnu++17}" = "$CXXFLAGS" ; then
-        CXXFLAGS="$CXXFLAGS -std=gnu++11"
-    fi
+    CXXFLAGS="$CXXFLAGS -std=gnu++17 -ffast-math -Wall -pipe"
 
     AUD_CHECK_CFLAGS(-Wtype-limits)
     AUD_CHECK_CFLAGS(-Wno-stringop-truncation)