authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-22 11:03:01-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-22 11:04:38-07:00
log32a175740c8750a7db550011795a4c22c0d0bc93
tree7b2fedda6b27176ca904f018a552d7d3f342563f
parent4bc90f17bb8cafeac84ba6ad6c6a4b4af9a3e091

cmake: don't ask zig2 to do hard things

Apparently hard things: * run autodoc on the std lib * build the langref If any zig distros want these documentation, they'll need to get them from a stage3 `zig build` instead of stage2 (LLVM backend instead of C backend).

1 files changed, 8 insertions(+), 6 deletions(-)

CMakeLists.txt+8-6
...@@ -81,6 +81,8 @@ message(STATUS "Configuring zig version ${RESOLVED_ZIG_VERSION}")...@@ -81,6 +81,8 @@ message(STATUS "Configuring zig version ${RESOLVED_ZIG_VERSION}")
81set(ZIG_NO_LIB off CACHE BOOL81set(ZIG_NO_LIB off CACHE BOOL
82 "Disable copying lib/ files to install prefix during the build phase")82 "Disable copying lib/ files to install prefix during the build phase")
8383
84# This used to do something and it may or may not do something in the future.
85# Right now it does nothing.
84set(ZIG_NO_LANGREF off CACHE BOOL86set(ZIG_NO_LANGREF off CACHE BOOL
85 "Disable copying of langref to the install prefix during the build phase")87 "Disable copying of langref to the install prefix during the build phase")
8688
...@@ -828,11 +830,6 @@ if(ZIG_NO_LIB)...@@ -828,11 +830,6 @@ if(ZIG_NO_LIB)
828else()830else()
829 set(ZIG_NO_LIB_ARG "")831 set(ZIG_NO_LIB_ARG "")
830endif()832endif()
831if(ZIG_NO_LANGREF)
832 set(ZIG_NO_LANGREF_ARG "-Dno-langref")
833else()
834 set(ZIG_NO_LANGREF_ARG "")
835endif()
836if(ZIG_SINGLE_THREADED)833if(ZIG_SINGLE_THREADED)
837 set(ZIG_SINGLE_THREADED_ARG "-Dsingle-threaded")834 set(ZIG_SINGLE_THREADED_ARG "-Dsingle-threaded")
838else()835else()
...@@ -850,6 +847,10 @@ else()...@@ -850,6 +847,10 @@ else()
850 set(ZIG_PIE_ARG "")847 set(ZIG_PIE_ARG "")
851endif()848endif()
852849
850# -Dno-langref is currently hardcoded because building the langref takes too damn long
851# -Dno-autodocs is currently hardcoded because the C backend generates a miscompilation
852# that prevents it from working.
853# To obtain these two forms of documentation, run zig build against stage3 rather than stage2.
853set(ZIG_BUILD_ARGS854set(ZIG_BUILD_ARGS
854 --zig-lib-dir "${CMAKE_SOURCE_DIR}/lib"855 --zig-lib-dir "${CMAKE_SOURCE_DIR}/lib"
855 "-Dconfig_h=${ZIG_CONFIG_H_OUT}"856 "-Dconfig_h=${ZIG_CONFIG_H_OUT}"
...@@ -857,7 +858,8 @@ set(ZIG_BUILD_ARGS...@@ -857,7 +858,8 @@ set(ZIG_BUILD_ARGS
857 ${ZIG_RELEASE_ARG}858 ${ZIG_RELEASE_ARG}
858 ${ZIG_STATIC_ARG}859 ${ZIG_STATIC_ARG}
859 ${ZIG_NO_LIB_ARG}860 ${ZIG_NO_LIB_ARG}
860 ${ZIG_NO_LANGREF_ARG}861 "-Dno-langref"
862 "-Dno-autodocs"
861 ${ZIG_SINGLE_THREADED_ARG}863 ${ZIG_SINGLE_THREADED_ARG}
862 ${ZIG_PIE_ARG}864 ${ZIG_PIE_ARG}
863 "-Dtarget=${ZIG_TARGET_TRIPLE}"865 "-Dtarget=${ZIG_TARGET_TRIPLE}"