From 4f4af83699baee609d788c35280fe68caeed9a12 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 5 Dec 2025 18:06:00 +0100 Subject: [PATCH] build: Fix more macOS build issues --- .github/workflows/build.yml | 2 +- cmake/build_helpers.cmake | 7 ------- dist/macOS/arm64.Dockerfile | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f90300c1..49287b1af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -590,7 +590,7 @@ jobs: GH_TOKEN: ${{ github.token }} run: | gh extension install actions/gh-actions-cache - gh actions-cache delete "build-macos-arm64-cache" --confirm || true + gh cache delete "macos-arm64-cache" --confirm || true macos-arm64-package: runs-on: macos-15-intel diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 8609a0599..456b96bab 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -774,17 +774,10 @@ macro(setupCompilerFlags target) endif() if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND APPLE) - execute_process(COMMAND brew --prefix llvm OUTPUT_VARIABLE LLVM_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE) - if (NOT LLVM_PREFIX STREQUAL "") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${LLVM_PREFIX}/lib/c++") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${LLVM_PREFIX}/lib/c++") - endif() addCCXXFlag("-Wno-unknown-warning-option" ${target}) if (CMAKE_BUILD_TYPE STREQUAL "Debug") add_compile_definitions(_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG) - else() - add_compile_definitions(_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE) endif() endif() diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile index 32716f67d..d021c4f0f 100644 --- a/dist/macOS/arm64.Dockerfile +++ b/dist/macOS/arm64.Dockerfile @@ -17,7 +17,7 @@ cp /tmp/arm-osx-mytriplet.cmake /vcpkg/triplets/community/arm-osx-mytriplet.cmak EOF ## Install make -RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make +RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make cmake ## fix environment ### add install_name_tool for cmake command that won't have the right env set (see PostprocessBundle.cmake function postprocess_bundle())