diff --git a/CMakeLists.txt b/CMakeLists.txt index 23222d73c7..1c3d16f7b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,12 +84,6 @@ set(ZIG_NO_LIB off CACHE BOOL set(ZIG_NO_LANGREF off CACHE BOOL "Disable copying of langref to the install prefix during the build phase") -set(ZIG_SKIP_INSTALL_LIB_FILES off CACHE BOOL "Deprecated. Use ZIG_NO_LIB") -if(ZIG_SKIP_INSTALL_LIB_FILES) - message(WARNING "ZIG_SKIP_INSTALL_LIB_FILES is deprecated. Use ZIG_NO_LIB instead.") - set(ZIG_NO_LIB ON) -endif() - set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)") set(ZIG_SHARED_LLVM off CACHE BOOL "Prefer linking against shared LLVM libraries") 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) message(SEND_ERROR "-DZIG_SHARED_LLVM and -DZIG_STATIC_LLVM cannot both be enabled simultaneously") endif() -string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED "${ZIG_LIBC_LIB_DIR}") -string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_STATIC_LIB_DIR_ESCAPED "${ZIG_LIBC_STATIC_LIB_DIR}") -string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_INCLUDE_DIR_ESCAPED "${ZIG_LIBC_INCLUDE_DIR}") - set(ZIG_TARGET_TRIPLE "native" CACHE STRING "arch-os-abi to output binaries for") set(ZIG_TARGET_MCPU "native" CACHE STRING "-mcpu parameter to output binaries for") 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}) find_package(Threads) set(ZIG_LIB_DIR "lib/zig") -set(C_HEADERS_DEST "${ZIG_LIB_DIR}/include") -set(LIBC_FILES_DEST "${ZIG_LIB_DIR}/libc") -set(LIBUNWIND_FILES_DEST "${ZIG_LIB_DIR}/libunwind") -set(LIBCXX_FILES_DEST "${ZIG_LIB_DIR}/libcxx") -set(ZIG_STD_DEST "${ZIG_LIB_DIR}/std") set(ZIG_CONFIG_H_OUT "${CMAKE_BINARY_DIR}/config.h") set(ZIG_CONFIG_ZIG_OUT "${CMAKE_BINARY_DIR}/config.zig") diff --git a/build.zig b/build.zig index 208d06fe1d..a98845d6cc 100644 --- a/build.zig +++ b/build.zig @@ -28,11 +28,7 @@ pub fn build(b: *std.Build) !void { 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; const test_step = b.step("test", "Run all the tests"); - const deprecated_skip_install_lib_files = b.option(bool, "skip-install-lib-files", "deprecated. see no-lib") orelse false; - if (deprecated_skip_install_lib_files) { - std.log.warn("-Dskip-install-lib-files is deprecated in favor of -Dno-lib", .{}); - } - 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; + 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; const skip_install_langref = b.option(bool, "no-langref", "skip copying of langref to the installation prefix") orelse skip_install_lib_files; const docgen_exe = b.addExecutable(.{ @@ -58,12 +54,6 @@ pub fn build(b: *std.Build) !void { const docs_step = b.step("docs", "Build documentation"); docs_step.dependOn(&docgen_cmd.step); - // This is for legacy reasons, to be removed after our CI scripts are upgraded to use - // the file from the install prefix instead. - const legacy_write_to_cache = b.addWriteFiles(); - legacy_write_to_cache.addCopyFileToSource(langref_file, "zig-cache/langref.html"); - docs_step.dependOn(&legacy_write_to_cache.step); - const check_case_exe = b.addExecutable(.{ .name = "check-case", .root_source_file = .{ .path = "test/src/Cases.zig" },