| 1 | From 3cfc11396f1ceb5e28d5401c795fa9a02b898cc9 Mon Sep 17 00:00:00 2001
|
| 2 | From: Hilton Chain <[email protected]>
|
| 3 | Date: Fri, 29 Nov 2024 14:13:46 +0800
|
| 4 | Subject: [PATCH] Fix RUNPATH issue.
|
| 5 |
|
| 6 | Add needed libraries and libc to RUNPATH when CROSS_LIBRARY_PATH or LIBRARY_PATH
|
| 7 | is set.
|
| 8 | ---
|
| 9 | lib/std/Build/Step/Compile.zig | 3 +++
|
| 10 | src/link/Elf.zig | 14 +++++++++++++
|
| 11 | src/main.zig | 37 +++++++++++++++++++++++++++++++++-
|
| 12 | 3 files changed, 53 insertions(+), 1 deletion(-)
|
| 13 |
|
| 14 | diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig
|
| 15 | index 5bf0805e79..836733a96e 100644
|
| 16 | |
| 17 | |
| 18 | @@ -743,6 +743,9 @@ fn runPkgConfig(self: *Compile, lib_name: []const u8) !PkgConfigResult {
|
| 19 | try zig_cflags.appendSlice(&[_][]const u8{ "-D", macro });
|
| 20 | } else if (mem.startsWith(u8, tok, "-D")) {
|
| 21 | try zig_cflags.append(tok);
|
| 22 | + } else if (mem.startsWith(u8, tok, "-Wl,-rpath=")) {
|
| 23 | + const dir = tok["-Wl,-rpath=".len..];
|
| 24 | + try zig_libs.appendSlice(&[_][]const u8{ "-L", dir });
|
| 25 | } else if (b.debug_pkg_config) {
|
| 26 | return self.step.fail("unknown pkg-config flag '{s}'", .{tok});
|
| 27 | }
|
| 28 | diff --git a/src/link/Elf.zig b/src/link/Elf.zig
|
| 29 | index 83a3d91346..6fd79fd1cd 100644
|
| 30 | |
| 31 | |
| 32 | @@ -1505,6 +1505,13 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
|
| 33 | try argv.append(rpath);
|
| 34 | }
|
| 35 |
|
| 36 | + if (comp.config.link_libc and link_mode == .dynamic and std.zig.system.NativePaths.isGuix(arena)) {
|
| 37 | + if (self.base.comp.libc_installation) |libc_installation| {
|
| 38 | + try argv.append("-rpath");
|
| 39 | + try argv.append(libc_installation.crt_dir.?);
|
| 40 | + }
|
| 41 | + }
|
| 42 | +
|
| 43 | try argv.appendSlice(&.{
|
| 44 | "-z",
|
| 45 | try std.fmt.allocPrint(arena, "stack-size={d}", .{self.base.stack_size}),
|
| 46 | @@ -2536,6 +2543,13 @@ fn linkWithLLD(self: *Elf, arena: Allocator, prog_node: *std.Progress.Node) !voi
|
| 47 | }
|
| 48 | }
|
| 49 |
|
| 50 | + if (comp.config.link_libc and link_mode == .dynamic and std.zig.system.NativePaths.isGuix(arena)) {
|
| 51 | + if (self.base.comp.libc_installation) |libc_installation| {
|
| 52 | + try argv.append("-rpath");
|
| 53 | + try argv.append(libc_installation.crt_dir.?);
|
| 54 | + }
|
| 55 | + }
|
| 56 | +
|
| 57 | for (self.symbol_wrap_set.keys()) |symbol_name| {
|
| 58 | try argv.appendSlice(&.{ "-wrap", symbol_name });
|
| 59 | }
|
| 60 | diff --git a/src/main.zig b/src/main.zig
|
| 61 | index d27b63d5a3..5b06739b4e 100644
|
| 62 | |
| 63 | |
| 64 | @@ -3701,7 +3701,7 @@ fn createModule(
|
| 65 | create_module.want_native_include_dirs = true;
|
| 66 | }
|
| 67 |
|
| 68 | - if (create_module.each_lib_rpath orelse resolved_target.is_native_os) {
|
| 69 | + if (create_module.each_lib_rpath orelse false) {
|
| 70 | try create_module.rpath_list.appendSlice(arena, create_module.lib_dirs.items);
|
| 71 | }
|
| 72 |
|
| 73 | @@ -3921,6 +3921,24 @@ fn createModule(
|
| 74 | if (create_module.resolved_system_libs.len != 0)
|
| 75 | create_module.opts.any_dyn_libs = true;
|
| 76 |
|
| 77 | + if (std.zig.system.NativePaths.isGuix(arena)) {
|
| 78 | + for (create_module.resolved_system_libs.items(.name)) |lib_name| {
|
| 79 | + for (create_module.lib_dirs.items) |lib_dir_path| {
|
| 80 | + if (try libPathExists(arena, lib_dir_path, lib_name, target)) {
|
| 81 | + try create_module.rpath_list.append(arena, lib_dir_path);
|
| 82 | + break;
|
| 83 | + }
|
| 84 | + }
|
| 85 | + }
|
| 86 | + for (create_module.link_objects.items) |obj| {
|
| 87 | + if (Compilation.classifyFileExt(obj.path) == .shared_library) {
|
| 88 | + const lib_dir_path = fs.path.dirname(obj.path) orelse continue;
|
| 89 | + if (obj.loption) continue;
|
| 90 | + try create_module.rpath_list.append(arena, lib_dir_path);
|
| 91 | + }
|
| 92 | + }
|
| 93 | + }
|
| 94 | +
|
| 95 | create_module.resolved_options = Compilation.Config.resolve(create_module.opts) catch |err| switch (err) {
|
| 96 | error.WasiExecModelRequiresWasi => fatal("only WASI OS targets support execution model", .{}),
|
| 97 | error.SharedMemoryIsWasmOnly => fatal("only WebAssembly CPU targets support shared memory", .{}),
|
| 98 | @@ -7348,3 +7366,20 @@ fn handleModArg(
|
| 99 | c_source_files_owner_index.* = create_module.c_source_files.items.len;
|
| 100 | rc_source_files_owner_index.* = create_module.rc_source_files.items.len;
|
| 101 | }
|
| 102 | +
|
| 103 | +fn libPathExists(
|
| 104 | + arena: Allocator,
|
| 105 | + lib_dir_path: []const u8,
|
| 106 | + lib_name: []const u8,
|
| 107 | + target: std.Target,
|
| 108 | +) !bool {
|
| 109 | + const sep = fs.path.sep_str;
|
| 110 | + const lib_path = try std.fmt.allocPrint(arena, "{s}" ++ sep ++ "{s}{s}{s}", .{
|
| 111 | + lib_dir_path,
|
| 112 | + target.libPrefix(),
|
| 113 | + lib_name,
|
| 114 | + target.dynamicLibSuffix(),
|
| 115 | + });
|
| 116 | + fs.cwd().access(lib_path, .{}) catch return false;
|
| 117 | + return true;
|
| 118 | +}
|
| 119 | --
|
| 120 | 2.46.0
|
| 121 |
|