From 196637c309e37e424e93f7501b49a1df7f7a1184 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Tue, 16 Apr 2024 02:42:10 +0200 Subject: [PATCH] . --- .../patches/zig-0.11-use-LIBRARY_PATH.patch | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch b/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch index 40d1f14..403d0b2 100644 --- a/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch +++ b/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch @@ -1,23 +1,18 @@ diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt *** zig.orig/CMakeLists.txt 2024-04-16 00:59:10.664981173 +0200 ---- zig/CMakeLists.txt 2024-04-16 02:01:09.845070498 +0200 +--- zig/CMakeLists.txt 2024-04-16 02:33:53.218625749 +0200 *************** -*** 906,911 **** ---- 906,912 ---- - - # -Dno-langref is currently hardcoded because building the langref takes too damn long - # To obtain these two forms of documentation, run zig build against stage3 rather than stage2. -+ string(REPLACE ":" ";" LIBRARY_PATH "$ENV{LIBRARY_PATH}") - set(ZIG_BUILD_ARGS - --zig-lib-dir "${CMAKE_SOURCE_DIR}/lib" - "-Dconfig_h=${ZIG_CONFIG_H_OUT}" -*************** -*** 919,924 **** ---- 920,926 ---- - "-Dtarget=${ZIG_TARGET_TRIPLE}" - "-Dcpu=${ZIG_TARGET_MCPU}" +*** 921,926 **** +--- 921,932 ---- "-Dversion-string=${RESOLVED_ZIG_VERSION}" -+ "--search-prefix $" ) ++ string(REPLACE ":" ";" LIBRARY_PATH "$ENV{LIBRARY_PATH}") ++ foreach(entry ${LIBRARY_PATH}) ++ LIST(APPEND ZIG_BUILD_ARGS "--search-prefix") ++ LIST(APPEND ZIG_BUILD_ARGS "${entry}") ++ endforeach() ++ add_custom_target(stage3 ALL + DEPENDS "${CMAKE_BINARY_DIR}/stage3/bin/zig" + )