Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

build: always add /usr/lib/{triple} to search path for Linux

Browse Source 
This is a common location for dynamic libraries. We already searched it
for Flatpak but we need to do this more generally.
This commit is contained in:
Mitchell Hashimoto
2023-08-07 10:20:20 -07:00
parent b28c7a5557
commit 68cd53e82d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.zig
View File

@ -644,6 +644,14 @@ fn addDeps(
return static_libs;
}
// On Linux, we need to add a couple common library paths that aren't
// on the standard search list. i.e. GTK is often in /usr/lib/x86_64-linux-gnu
// on x86_64.
if (step.target.isLinux()) {
const triple = try step.target.linuxTriple(b.allocator);
step.addLibraryPath(.{ .path = b.fmt("/usr/lib/{s}", .{triple}) });
}
// If we're building a lib we have some different deps
const lib = step.kind == .lib;
@ -800,14 +808,7 @@ fn addDeps(
// When we're targeting flatpak we ALWAYS link GTK so we
// get access to glib for dbus.
if (flatpak) {
step.linkSystemLibrary("gtk4");
switch (step.target.getCpuArch()) {
.aarch64 => step.addLibraryPath(.{ .path = "/usr/lib/aarch64-linux-gnu" }),
.x86_64 => step.addLibraryPath(.{ .path = "/usr/lib/x86_64-linux-gnu" }),
else => @panic("unsupported flatpak target"),
}
}
if (flatpak) step.linkSystemLibrary("gtk4");
switch (app_runtime) {
.none => {},