1f508a59da
Adding 0.14.1. Note that this version fails to build on x86_64 for whatever reason idk OBS-URL: https://build.opensuse.org/request/show/1306134 OBS-URL: https://build.opensuse.org/package/show/devel:languages:zig/zig0.14?expand=0&rev=1
68 lines
2.5 KiB
Diff
68 lines
2.5 KiB
Diff
Since we patched it to invoke LLD directly, we will have
|
|
to remove any mentions of LLD here.
|
|
Index: zig-0.14.0/build.zig
|
|
===================================================================
|
|
--- zig-0.14.0.orig/build.zig
|
|
+++ zig-0.14.0/build.zig
|
|
@@ -756,12 +756,12 @@ fn addCmakeCfgOptionsToExe(
|
|
cfg.cmake_static_library_suffix,
|
|
}),
|
|
}) });
|
|
- assert(cfg.lld_include_dir.len != 0);
|
|
- mod.addIncludePath(.{ .cwd_relative = cfg.lld_include_dir });
|
|
+ // 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.lld_libraries);
|
|
addCMakeLibraryList(mod, cfg.llvm_libraries);
|
|
|
|
if (use_zig_libcxx) {
|
|
@@ -928,8 +928,8 @@ const CMakeConfig = struct {
|
|
cmake_static_library_suffix: []const u8,
|
|
cxx_compiler: []const u8,
|
|
cxx_compiler_arg1: []const u8,
|
|
- lld_include_dir: []const u8,
|
|
- lld_libraries: []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,
|
|
@@ -995,8 +995,8 @@ fn parseConfigH(b: *std.Build, config_h_
|
|
.cmake_static_library_suffix = undefined,
|
|
.cxx_compiler = undefined,
|
|
.cxx_compiler_arg1 = "",
|
|
- .lld_include_dir = undefined,
|
|
- .lld_libraries = undefined,
|
|
+ // .lld_include_dir = undefined,
|
|
+ // .lld_libraries = undefined,
|
|
.clang_libraries = undefined,
|
|
.llvm_lib_dir = undefined,
|
|
.llvm_include_dir = undefined,
|
|
@@ -1030,14 +1030,14 @@ fn parseConfigH(b: *std.Build, config_h_
|
|
.prefix = "#define ZIG_CXX_COMPILER_ARG1 ",
|
|
.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_LLD_INCLUDE_PATH ",
|
|
+ // .field = "lld_include_dir",
|
|
+ // },
|
|
+ // .{
|
|
+ // .prefix = "#define ZIG_LLD_LIBRARIES ",
|
|
+ // .field = "lld_libraries",
|
|
+ // },
|
|
.{
|
|
.prefix = "#define ZIG_CLANG_LIBRARIES ",
|
|
.field = "clang_libraries",
|