61aaad57b0
Latest zig version. OBS-URL: https://build.opensuse.org/request/show/1306135 OBS-URL: https://build.opensuse.org/package/show/devel:languages:zig/zig0.15?expand=0&rev=1
66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
diff -ruN zig-0.15.1.orig/build.zig zig-0.15.1/build.zig
|
|
--- zig-0.15.1.orig/build.zig 2025-08-27 22:13:38.504308190 +0800
|
|
+++ zig-0.15.1/build.zig 2025-08-27 23:06:14.149084513 +0800
|
|
@@ -205,7 +205,6 @@
|
|
|
|
const use_llvm = b.option(bool, "use-llvm", "Use the llvm backend");
|
|
exe.use_llvm = use_llvm;
|
|
- exe.use_lld = use_llvm;
|
|
|
|
if (no_bin) {
|
|
b.getInstallStep().dependOn(&exe.step);
|
|
@@ -559,7 +558,6 @@
|
|
}),
|
|
.filters = test_filters,
|
|
.use_llvm = use_llvm,
|
|
- .use_lld = use_llvm,
|
|
.zig_lib_dir = b.path("lib"),
|
|
});
|
|
if (link_libc) {
|
|
@@ -787,12 +785,9 @@
|
|
cfg.cmake_static_library_suffix,
|
|
}),
|
|
}) });
|
|
- assert(cfg.lld_include_dir.len != 0);
|
|
- mod.addIncludePath(.{ .cwd_relative = cfg.lld_include_dir });
|
|
mod.addIncludePath(.{ .cwd_relative = cfg.llvm_include_dir });
|
|
mod.addLibraryPath(.{ .cwd_relative = cfg.llvm_lib_dir });
|
|
addCMakeLibraryList(mod, cfg.clang_libraries);
|
|
- addCMakeLibraryList(mod, cfg.lld_libraries);
|
|
addCMakeLibraryList(mod, cfg.llvm_libraries);
|
|
|
|
if (use_zig_libcxx) {
|
|
@@ -980,8 +975,6 @@
|
|
cmake_static_library_suffix: []const u8,
|
|
cxx_compiler: []const u8,
|
|
cxx_compiler_arg1: []const u8,
|
|
- lld_include_dir: []const u8,
|
|
- lld_libraries: []const u8,
|
|
clang_libraries: []const u8,
|
|
llvm_lib_dir: []const u8,
|
|
llvm_include_dir: []const u8,
|
|
@@ -1047,8 +1040,6 @@
|
|
.cmake_static_library_suffix = undefined,
|
|
.cxx_compiler = undefined,
|
|
.cxx_compiler_arg1 = "",
|
|
- .lld_include_dir = undefined,
|
|
- .lld_libraries = undefined,
|
|
.clang_libraries = undefined,
|
|
.llvm_lib_dir = undefined,
|
|
.llvm_include_dir = undefined,
|
|
@@ -1083,14 +1074,6 @@
|
|
.field = "cxx_compiler_arg1",
|
|
},
|
|
.{
|
|
- .prefix = "#define ZIG_LLD_INCLUDE_PATH ",
|
|
- .field = "lld_include_dir",
|
|
- },
|
|
- .{
|
|
- .prefix = "#define ZIG_LLD_LIBRARIES ",
|
|
- .field = "lld_libraries",
|
|
- },
|
|
- .{
|
|
.prefix = "#define ZIG_CLANG_LIBRARIES ",
|
|
.field = "clang_libraries",
|
|
},
|