From a6cc4ca210635779bd57a7a2ae3ee0fdcaa2b6d9 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 4 Nov 2023 15:02:39 +0100 Subject: [PATCH] Set native compiler to gcc --- .github/workflows/build.yml | 2 ++ dist/macOS/macos_arm_toolchain.cmake | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fd342ce2..bd0d2ffc1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -235,6 +235,8 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache \ -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \ + -DNATIVE_CMAKE_C_COMPILER="$(brew --prefix gcc@12)/bin/gcc-12" \ + -DNATIVE_CMAKE_CXX_COMPILER="$(brew --prefix gcc@12)/bin/g++-12" \ -DIMHEX_PATTERNS_PULL_MASTER=ON \ -DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}" \ -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}" \ diff --git a/dist/macOS/macos_arm_toolchain.cmake b/dist/macOS/macos_arm_toolchain.cmake index f9a9a985b..ac90e9c47 100644 --- a/dist/macOS/macos_arm_toolchain.cmake +++ b/dist/macOS/macos_arm_toolchain.cmake @@ -2,8 +2,3 @@ set(CMAKE_SYSTEM_NAME Darwin) set(CMAKE_SYSTEM_PROCESSOR arm64) set(CMAKE_OSX_ARCHITECTURES arm64 CACHE INTERNAL "" FORCE) SET(CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" FORCE) - -set(NATIVE_CMAKE_C_COMPILER ${CMAKE_C_COMPILER}) -set(NATIVE_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER}) -set(NATIVE_CMAKE_C_FLAGS "-target x86_64-apple-macos12.7") -set(NATIVE_CMAKE_CXX_FLAGS "-target x86_64-apple-macos12.7")