| author |  Eric Joldasov <bratishkaerik@getgoogleoff.me> 2023-05-14 22:59:30+06:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2023-05-14 23:02:01-07:00 |
| log | 6f3dacc1073c30d10f640fe630580a4866cbd9db |
| tree | bc1602327e86cb4f58b66659ce1a3b94c8cab810 |
| parent | 2516d8671faaaff7e8803a2025ba4891a6ae7c78 |
CMakeLists.txt and build.zig: remove deprecated options
Signed-off-by: Eric Joldasov <bratishkaerik@getgoogleoff.me>2 files changed, 1 insertions(+), 26 deletions(-)
CMakeLists.txt-15
| ... | ... | @@ -84,12 +84,6 @@ set(ZIG_NO_LIB off CACHE BOOL |
| 84 | 84 | set(ZIG_NO_LANGREF off CACHE BOOL |
| 85 | 85 | "Disable copying of langref to the install prefix during the build phase") |
| 86 | 86 | |
| 87 | set(ZIG_SKIP_INSTALL_LIB_FILES off CACHE BOOL "Deprecated. Use ZIG_NO_LIB") | |
| 88 | if(ZIG_SKIP_INSTALL_LIB_FILES) | |
| 89 | message(WARNING "ZIG_SKIP_INSTALL_LIB_FILES is deprecated. Use ZIG_NO_LIB instead.") | |
| 90 | set(ZIG_NO_LIB ON) | |
| 91 | endif() | |
| 92 | ||
| 93 | 87 | set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)") |
| 94 | 88 | set(ZIG_SHARED_LLVM off CACHE BOOL "Prefer linking against shared LLVM libraries") |
| 95 | 89 | set(ZIG_STATIC_LLVM ${ZIG_STATIC} CACHE BOOL "Prefer linking against static LLVM libraries") |
| ... | ... | @@ -110,10 +104,6 @@ if (ZIG_SHARED_LLVM AND ZIG_STATIC_LLVM) |
| 110 | 104 | message(SEND_ERROR "-DZIG_SHARED_LLVM and -DZIG_STATIC_LLVM cannot both be enabled simultaneously") |
| 111 | 105 | endif() |
| 112 | 106 | |
| 113 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED "${ZIG_LIBC_LIB_DIR}") | |
| 114 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_STATIC_LIB_DIR_ESCAPED "${ZIG_LIBC_STATIC_LIB_DIR}") | |
| 115 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_INCLUDE_DIR_ESCAPED "${ZIG_LIBC_INCLUDE_DIR}") | |
| 116 | ||
| 117 | 107 | set(ZIG_TARGET_TRIPLE "native" CACHE STRING "arch-os-abi to output binaries for") |
| 118 | 108 | set(ZIG_TARGET_MCPU "native" CACHE STRING "-mcpu parameter to output binaries for") |
| 119 | 109 | set(ZIG_SINGLE_THREADED off CACHE BOOL "limit the zig compiler to use only 1 thread") |
| ... | ... | @@ -185,11 +175,6 @@ include_directories(${CLANG_INCLUDE_DIRS}) |
| 185 | 175 | find_package(Threads) |
| 186 | 176 | |
| 187 | 177 | set(ZIG_LIB_DIR "lib/zig") |
| 188 | set(C_HEADERS_DEST "${ZIG_LIB_DIR}/include") | |
| 189 | set(LIBC_FILES_DEST "${ZIG_LIB_DIR}/libc") | |
| 190 | set(LIBUNWIND_FILES_DEST "${ZIG_LIB_DIR}/libunwind") | |
| 191 | set(LIBCXX_FILES_DEST "${ZIG_LIB_DIR}/libcxx") | |
| 192 | set(ZIG_STD_DEST "${ZIG_LIB_DIR}/std") | |
| 193 | 178 | set(ZIG_CONFIG_H_OUT "${CMAKE_BINARY_DIR}/config.h") |
| 194 | 179 | set(ZIG_CONFIG_ZIG_OUT "${CMAKE_BINARY_DIR}/config.zig") |
| 195 | 180 |
build.zig+1-11
| ... | ... | @@ -28,11 +28,7 @@ pub fn build(b: *std.Build) !void { |
| 28 | 28 | const use_zig_libcxx = b.option(bool, "use-zig-libcxx", "If libc++ is needed, use zig's bundled version, don't try to integrate with the system") orelse false; |
| 29 | 29 | |
| 30 | 30 | const test_step = b.step("test", "Run all the tests"); |
| 31 | const deprecated_skip_install_lib_files = b.option(bool, "skip-install-lib-files", "deprecated. see no-lib") orelse false; | |
| 32 | if (deprecated_skip_install_lib_files) { | |
| 33 | std.log.warn("-Dskip-install-lib-files is deprecated in favor of -Dno-lib", .{}); | |
| 34 | } | |
| 35 | const skip_install_lib_files = b.option(bool, "no-lib", "skip copying of lib/ files and langref to installation prefix. Useful for development") orelse deprecated_skip_install_lib_files; | |
| 31 | const skip_install_lib_files = b.option(bool, "no-lib", "skip copying of lib/ files and langref to installation prefix. Useful for development") orelse false; | |
| 36 | 32 | const skip_install_langref = b.option(bool, "no-langref", "skip copying of langref to the installation prefix") orelse skip_install_lib_files; |
| 37 | 33 | |
| 38 | 34 | const docgen_exe = b.addExecutable(.{ |
| ... | ... | @@ -58,12 +54,6 @@ pub fn build(b: *std.Build) !void { |
| 58 | 54 | const docs_step = b.step("docs", "Build documentation"); |
| 59 | 55 | docs_step.dependOn(&docgen_cmd.step); |
| 60 | 56 | |
| 61 | // This is for legacy reasons, to be removed after our CI scripts are upgraded to use | |
| 62 | // the file from the install prefix instead. | |
| 63 | const legacy_write_to_cache = b.addWriteFiles(); | |
| 64 | legacy_write_to_cache.addCopyFileToSource(langref_file, "zig-cache/langref.html"); | |
| 65 | docs_step.dependOn(&legacy_write_to_cache.step); | |
| 66 | ||
| 67 | 57 | const check_case_exe = b.addExecutable(.{ |
| 68 | 58 | .name = "check-case", |
| 69 | 59 | .root_source_file = .{ .path = "test/src/Cases.zig" }, |