Merge branch 'ghostty-org:main' into select_boundary_dollar

This commit is contained in:
Toby Jaffey
2024-12-12 16:59:59 +00:00
committed by GitHub

View File

@ -1120,8 +1120,7 @@ fn addDeps(
}); });
step.root_module.addImport("oniguruma", oniguruma_dep.module("oniguruma")); step.root_module.addImport("oniguruma", oniguruma_dep.module("oniguruma"));
if (b.systemIntegrationOption("oniguruma", .{})) { if (b.systemIntegrationOption("oniguruma", .{})) {
// Oniguruma is compiled and distributed as libonig.so step.linkSystemLibrary2("oniguruma", dynamic_link_opts);
step.linkSystemLibrary2("onig", dynamic_link_opts);
} else { } else {
step.linkLibrary(oniguruma_dep.artifact("oniguruma")); step.linkLibrary(oniguruma_dep.artifact("oniguruma"));
try static_libs.append(oniguruma_dep.artifact("oniguruma").getEmittedBin()); try static_libs.append(oniguruma_dep.artifact("oniguruma").getEmittedBin());