$NetBSD: patch-CMakeLists.txt,v 1.7 2025/08/05 13:33:19 wiz Exp $ Do not append a buildlinked directory to ZIG_CMAKE_PREFIX_PATH to avoid WRKREF in bin/zig. Skip stage3 during build to: * speed up building * avoid work directory reference in zig's RUNPATH. --- CMakeLists.txt.orig 2025-05-23 04:31:41.000000000 +0000 +++ CMakeLists.txt @@ -18,13 +18,7 @@ endif() # cache variable. Furthermore, the environment variable follows the system path # separator, such as ':' on POSIX and ';' on Windows, but the cache variable # follows CMake's array behavior, i.e. always ';' for a separator. -list(APPEND ZIG_CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}") -if(WIN32) - list(APPEND ZIG_CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -else() - string(REGEX REPLACE ":" ";" ZIG_CMAKE_PREFIX_PATH_STRING "$ENV{CMAKE_PREFIX_PATH}") - list(APPEND ZIG_CMAKE_PREFIX_PATH "${ZIG_CMAKE_PREFIX_PATH_STRING}") -endif() +set(ZIG_CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}") list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -978,18 +972,9 @@ if(MINGW AND "${ZIG_HOST_TARGET_ARCH}" S endif() -add_custom_target(stage3 ALL - DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig" -) set(ZIG2_WORKING_DIR "${PROJECT_SOURCE_DIR}") -add_custom_command( - OUTPUT "${PROJECT_BINARY_DIR}/stage3/bin/zig" - COMMAND zig2 build --prefix "${PROJECT_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS} - COMMENT "Building stage3" - WORKING_DIRECTORY "${ZIG2_WORKING_DIR}" -) set(ZIG_EXECUTABLE "$")