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: dynamic link first (mode_first)

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-08-07 10:49:50 -07:00
parent d356d5ea38
commit a348adf26b
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
build.zig
View File

@ -644,6 +644,14 @@ fn addDeps(
return static_libs; return static_libs;
} }
// For dynamic linking, we prefer dynamic linking and to search by
// mode first. Mode first will search all paths for a dynamic library
// before falling back to static.
const dynamic_link_opts: std.build.Step.Compile.LinkSystemLibraryOptions = .{
.preferred_link_mode = .Dynamic,
.search_strategy = .mode_first,
};
// On Linux, we need to add a couple common library paths that aren't // 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 the standard search list. i.e. GTK is often in /usr/lib/x86_64-linux-gnu
// on x86_64. // on x86_64.
@ -711,20 +719,15 @@ fn addDeps(
// Dynamic link // Dynamic link
if (!static) { if (!static) {
step.addIncludePath(.{ .path = freetype.include_path_self }); step.addIncludePath(.{ .path = freetype.include_path_self });
step.linkSystemLibrary("bzip2"); step.linkSystemLibrary2("bzip2", dynamic_link_opts);
step.linkSystemLibrary("freetype2"); step.linkSystemLibrary2("freetype2", dynamic_link_opts);
step.linkSystemLibrary("harfbuzz"); step.linkSystemLibrary2("harfbuzz", dynamic_link_opts);
step.linkSystemLibrary("libpng"); step.linkSystemLibrary2("libpng", dynamic_link_opts);
step.linkSystemLibrary("pixman-1"); step.linkSystemLibrary2("pixman-1", dynamic_link_opts);
step.linkSystemLibrary("zlib"); step.linkSystemLibrary2("zlib", dynamic_link_opts);
if (font_backend.hasFontconfig()) { if (font_backend.hasFontconfig()) {
step.linkSystemLibrary("fontconfig"); step.linkSystemLibrary2("fontconfig", dynamic_link_opts);
// Required on some systems, and pkg-config for fontconfig
// doesn't include it
step.linkSystemLibrary("libxml-2.0");
step.linkSystemLibrary("uuid");
} }
} }
@ -815,7 +818,7 @@ fn addDeps(
// When we're targeting flatpak we ALWAYS link GTK so we // When we're targeting flatpak we ALWAYS link GTK so we
// get access to glib for dbus. // get access to glib for dbus.
if (flatpak) step.linkSystemLibrary("gtk4"); if (flatpak) step.linkSystemLibrary2("gtk4", dynamic_link_opts);
switch (app_runtime) { switch (app_runtime) {
.none => {}, .none => {},
@ -842,7 +845,7 @@ fn addDeps(
}; };
try glfw.link(b, step, glfw_opts); try glfw.link(b, step, glfw_opts);
step.linkSystemLibrary("gtk4"); step.linkSystemLibrary2("gtk4", dynamic_link_opts);
}, },
} }
} }

6
flake.lock generated
View File

@ -126,11 +126,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1690978078, "lastModified": 1691410097,
"narHash": "sha256-+S9s6sjOGuGCtA9njTdduJ7KjZm2tskxKhwGRKBK/xM=", "narHash": "sha256-HoZ/JwddeysSKNYr7h3AqReCMXPcqgqW/eBVOekxhFM=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "c9f51464f2c2c9c75f3d7fdc58c157d252545dec", "rev": "9eda53e9001c54c810e24efe256c28d57a75d20d",
"type": "github" "type": "github"
}, },
"original": { "original": {