From ed430d5fe27d77442b841a09cccbe20f491f4160 Mon Sep 17 00:00:00 2001 From: "Mateusz Szychowski (Muttley)" Date: Fri, 9 Aug 2024 09:23:37 +0200 Subject: [PATCH] use GCC11 on macOS --- .github/workflows/clang-tools-amd64.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/clang-tools-amd64.yml b/.github/workflows/clang-tools-amd64.yml index f46e103..0d7993b 100644 --- a/.github/workflows/clang-tools-amd64.yml +++ b/.github/workflows/clang-tools-amd64.yml @@ -50,14 +50,14 @@ jobs: release: llvm-project-18.1.8.src - os: linux runner: ubuntu-20.04 - os-cmake-args: '-DLLVM_BUILD_STATIC=ON -DCMAKE_CXX_FLAGS="-s -flto" ${POSIX_CMAKE_ARGS}' + os-cmake-args: '-DLLVM_BUILD_STATIC=ON -DCMAKE_CXX_FLAGS="-s -flto" ${POSIX_CMAKE_ARGS} ${LINUX_CMAKE_ARGS}' build-args: '-j$(nproc)' bindir: '/build/bin' dotexe: '' shacmd: 'sha512sum' - os: macosx runner: macos-13 - os-cmake-args: '-DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -flto" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 ${POSIX_CMAKE_ARGS}' + os-cmake-args: '-DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -flto" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 ${POSIX_CMAKE_ARGS} ${MACOS_CMAKE_ARGS}' build-args: '-j$(sysctl -n hw.ncpu)' bindir: '/build/bin' dotexe: '' @@ -74,7 +74,9 @@ jobs: runs-on: ${{ matrix.runner }} env: COMMON_CMAKE_ARGS: '-DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"' - POSIX_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10' + LINUX_CMAKE_ARGS: '-DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10' + MACOS_CMAKE_ARGS: '-DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11' + POSIX_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=MinSizeRel' RELEASE: '${{ matrix.release }}' suffix: '${{ matrix.clang-version }}_${{ matrix.os }}-amd64' steps: