Skip to content

Commit b7d664f

Browse files
authored
Merge pull request #1 from mcahyadit/master
feat: added CMAKE_CXX_COMPILER_AR and CMAKE_CXX_COMPILER_RANLIB definiton
2 parents 9dc851f + 1c8294f commit b7d664f

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

zig-toolchain.cmake

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,15 @@ _zig_write_script("zig-nm" "nm" FALSE FALSE)
188188
_zig_write_script("zig-objcopy" "objcopy" FALSE FALSE)
189189
_zig_write_script("zig-strip" "strip" FALSE FALSE)
190190

191-
set(CMAKE_C_COMPILER "${_zig_shims_dir}/zig-cc${_zig_wrapper_ext}")
192-
set(CMAKE_CXX_COMPILER "${_zig_shims_dir}/zig-c++${_zig_wrapper_ext}")
193-
set(CMAKE_AR "${_zig_shims_dir}/zig-ar${_zig_wrapper_ext}" CACHE FILEPATH "Archiver" FORCE)
194-
set(CMAKE_RANLIB "${_zig_shims_dir}/zig-ranlib${_zig_wrapper_ext}" CACHE FILEPATH "Ranlib" FORCE)
195-
set(CMAKE_NM "${_zig_shims_dir}/zig-nm${_zig_wrapper_ext}" CACHE FILEPATH "NM" FORCE)
196-
set(CMAKE_OBJCOPY "${_zig_shims_dir}/zig-objcopy${_zig_wrapper_ext}" CACHE FILEPATH "Objcopy" FORCE)
197-
set(CMAKE_STRIP "${_zig_shims_dir}/zig-strip${_zig_wrapper_ext}" CACHE FILEPATH "Strip" FORCE)
191+
set(CMAKE_C_COMPILER "${_zig_shims_dir}/zig-cc${_zig_wrapper_ext}")
192+
set(CMAKE_CXX_COMPILER "${_zig_shims_dir}/zig-c++${_zig_wrapper_ext}")
193+
set(CMAKE_AR "${_zig_shims_dir}/zig-ar${_zig_wrapper_ext}" CACHE FILEPATH "Archiver" FORCE)
194+
set(CMAKE_CXX_COMPILER_AR "${CMAKE_AR}")
195+
set(CMAKE_RANLIB "${_zig_shims_dir}/zig-ranlib${_zig_wrapper_ext}" CACHE FILEPATH "Ranlib" FORCE)
196+
set(CMAKE_CXX_COMPILER_RANLIB "${CMAKE_RANLIB}")
197+
set(CMAKE_NM "${_zig_shims_dir}/zig-nm${_zig_wrapper_ext}" CACHE FILEPATH "NM" FORCE)
198+
set(CMAKE_OBJCOPY "${_zig_shims_dir}/zig-objcopy${_zig_wrapper_ext}" CACHE FILEPATH "Objcopy" FORCE)
199+
set(CMAKE_STRIP "${_zig_shims_dir}/zig-strip${_zig_wrapper_ext}" CACHE FILEPATH "Strip" FORCE)
198200

199201
if(CMAKE_HOST_WIN32)
200202
# Unsupported linker arg: --dependency-file. See https://github.com/ziglang/zig/issues/22213

0 commit comments

Comments
 (0)