This commit is contained in:
Daniel Ziltener 2024-04-16 02:42:10 +02:00
parent fe0231034c
commit 196637c309
Signed by: zilti
GPG key ID: B38976E82C9DAE42

View file

@ -1,23 +1,18 @@
diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt
*** zig.orig/CMakeLists.txt 2024-04-16 00:59:10.664981173 +0200 *** 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 **** *** 921,926 ****
--- 906,912 ---- --- 921,932 ----
# -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}"
"-Dversion-string=${RESOLVED_ZIG_VERSION}" "-Dversion-string=${RESOLVED_ZIG_VERSION}"
+ "--search-prefix $<JOIN:${LIBRARY_PATH}, --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 add_custom_target(stage3 ALL
DEPENDS "${CMAKE_BINARY_DIR}/stage3/bin/zig"
)