From 1c8294f27e071ba88dbe9a0de5d14c4541361999 Mon Sep 17 00:00:00 2001 From: mcahyadit Date: Wed, 29 Apr 2026 11:54:15 +0800 Subject: [PATCH] feat: added CMAKE_CXX_COMPILER_AR and CMAKE_CXX_COMPILER_RANLIB definition some projects seems to require the AR and RANLIB to defined with `CMAKE_CXX_COMPILER_**` instead of just `CMAKE_**`. this commit simply adds a wrapper to the existing definitions to allow those projects to compile. --- zig-toolchain.cmake | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/zig-toolchain.cmake b/zig-toolchain.cmake index 204c92b..ec503bc 100644 --- a/zig-toolchain.cmake +++ b/zig-toolchain.cmake @@ -188,13 +188,15 @@ _zig_write_script("zig-nm" "nm" FALSE FALSE) _zig_write_script("zig-objcopy" "objcopy" FALSE FALSE) _zig_write_script("zig-strip" "strip" FALSE FALSE) -set(CMAKE_C_COMPILER "${_zig_shims_dir}/zig-cc${_zig_wrapper_ext}") -set(CMAKE_CXX_COMPILER "${_zig_shims_dir}/zig-c++${_zig_wrapper_ext}") -set(CMAKE_AR "${_zig_shims_dir}/zig-ar${_zig_wrapper_ext}" CACHE FILEPATH "Archiver" FORCE) -set(CMAKE_RANLIB "${_zig_shims_dir}/zig-ranlib${_zig_wrapper_ext}" CACHE FILEPATH "Ranlib" FORCE) -set(CMAKE_NM "${_zig_shims_dir}/zig-nm${_zig_wrapper_ext}" CACHE FILEPATH "NM" FORCE) -set(CMAKE_OBJCOPY "${_zig_shims_dir}/zig-objcopy${_zig_wrapper_ext}" CACHE FILEPATH "Objcopy" FORCE) -set(CMAKE_STRIP "${_zig_shims_dir}/zig-strip${_zig_wrapper_ext}" CACHE FILEPATH "Strip" FORCE) +set(CMAKE_C_COMPILER "${_zig_shims_dir}/zig-cc${_zig_wrapper_ext}") +set(CMAKE_CXX_COMPILER "${_zig_shims_dir}/zig-c++${_zig_wrapper_ext}") +set(CMAKE_AR "${_zig_shims_dir}/zig-ar${_zig_wrapper_ext}" CACHE FILEPATH "Archiver" FORCE) +set(CMAKE_CXX_COMPILER_AR "${CMAKE_AR}") +set(CMAKE_RANLIB "${_zig_shims_dir}/zig-ranlib${_zig_wrapper_ext}" CACHE FILEPATH "Ranlib" FORCE) +set(CMAKE_CXX_COMPILER_RANLIB "${CMAKE_RANLIB}") +set(CMAKE_NM "${_zig_shims_dir}/zig-nm${_zig_wrapper_ext}" CACHE FILEPATH "NM" FORCE) +set(CMAKE_OBJCOPY "${_zig_shims_dir}/zig-objcopy${_zig_wrapper_ext}" CACHE FILEPATH "Objcopy" FORCE) +set(CMAKE_STRIP "${_zig_shims_dir}/zig-strip${_zig_wrapper_ext}" CACHE FILEPATH "Strip" FORCE) if(CMAKE_HOST_WIN32) # Unsupported linker arg: --dependency-file. See https://github.com/ziglang/zig/issues/22213