pkg(highway): Enable system-integration

Move bridge.cpp to being a module cSourceFile instead of part of the staticlib
Dynamic link against highway with pkg-config name 'libhwy.pc' when system-integrated

Author: AnthonyZhOon

pkg/highway/build.zig

@@ -4,28 +4,15 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const upstream = b.dependency("highway", .{});
-
     const module = b.addModule("highway", .{
         .root_source_file = b.path("main.zig"),
         .target = target,
         .optimize = optimize,
     });
-
-    const lib = b.addStaticLibrary(.{
-        .name = "highway",
-        .target = target,
-        .optimize = optimize,
-    });
-    lib.linkLibCpp();
-    lib.addIncludePath(upstream.path(""));
-    module.addIncludePath(upstream.path(""));
-
-    if (target.result.os.tag.isDarwin()) {
-        const apple_sdk = @import("apple_sdk");
-        try apple_sdk.addPaths(b, lib.root_module);
-        try apple_sdk.addPaths(b, module);
-    }
+    const dynamic_link_opts: std.Build.Module.LinkSystemLibraryOptions = .{
+        .preferred_link_mode = .dynamic,
+        .search_strategy = .mode_first,
+    };
 
     var flags = std.ArrayList([]const u8).init(b.allocator);
     defer flags.deinit();
@@ -70,8 +57,62 @@ pub fn build(b: *std.Build) !void {
             "-fno-exceptions",
         });
     }
+    var test_exe: ?*std.Build.Step.Compile = null;
+    if (target.query.isNative()) {
+        test_exe = b.addTest(.{
+            .name = "test",
+            .root_source_file = b.path("main.zig"),
+            .target = target,
+            .optimize = optimize,
+        });
+        const tests_run = b.addRunArtifact(test_exe.?);
+        const test_step = b.step("test", "Run tests");
+        test_step.dependOn(&tests_run.step);
+        var it = module.import_table.iterator();
+        while (it.next()) |entry| test_exe.?.root_module.addImport(entry.key_ptr.*, entry.value_ptr.*);
+
+        // Uncomment this if we're debugging tests
+        // b.installArtifact(test_exe.?);
+    }
+
+    module.addCSourceFiles(.{ .flags = flags.items, .files = &.{"bridge.cpp"} });
+
+    if (b.systemIntegrationOption("highway", .{})) {
+        module.linkSystemLibrary("libhwy", dynamic_link_opts);
+        // TODO
+    } else {
+        const lib = try buildLib(b, module, .{
+            .target = target,
+            .optimize = optimize,
+            .flags = flags,
+        });
+        if (test_exe) |exe| {
+            exe.linkLibrary(lib);
+        }
+    }
+}
+
+fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Build.Step.Compile {
+    const target = options.target;
+    const optimize = options.optimize;
+    const flags = options.flags;
+
+    const upstream = b.dependency("highway", .{});
+    const lib = b.addStaticLibrary(.{
+        .name = "highway",
+        .target = target,
+        .optimize = optimize,
+    });
+    lib.linkLibCpp();
+    lib.addIncludePath(upstream.path(""));
+    module.addIncludePath(upstream.path(""));
+
+    if (target.result.os.tag.isDarwin()) {
+        const apple_sdk = @import("apple_sdk");
+        try apple_sdk.addPaths(b, lib.root_module);
+        try apple_sdk.addPaths(b, module);
+    }
 
-    lib.addCSourceFiles(.{ .flags = flags.items, .files = &.{"bridge.cpp"} });
     lib.addCSourceFiles(.{
         .root = upstream.path(""),
         .flags = flags.items,
@@ -92,20 +133,5 @@ pub fn build(b: *std.Build) !void {
     );
 
     b.installArtifact(lib);
-
-    {
-        const test_exe = b.addTest(.{
-            .name = "test",
-            .root_source_file = b.path("main.zig"),
-            .target = target,
-            .optimize = optimize,
-        });
-        test_exe.linkLibrary(lib);
-
-        var it = module.import_table.iterator();
-        while (it.next()) |entry| test_exe.root_module.addImport(entry.key_ptr.*, entry.value_ptr.*);
-        const tests_run = b.addRunArtifact(test_exe);
-        const test_step = b.step("test", "Run tests");
-        test_step.dependOn(&tests_run.step);
-    }
+    return lib;
 }

src/build/SharedDeps.zig

@@ -411,8 +411,12 @@ pub fn add(
         .target = target,
         .optimize = optimize,
     });
-    step.linkLibrary(highway_dep.artifact("highway"));
-    try static_libs.append(highway_dep.artifact("highway").getEmittedBin());
+    if (b.systemIntegrationOption("highway", .{})) {
+        step.linkSystemLibrary2("libhwy", dynamic_link_opts);
+    } else {
+        step.linkLibrary(highway_dep.artifact("highway"));
+        try static_libs.append(highway_dep.artifact("highway").getEmittedBin());
+    }
 
     // utfcpp - This is used as a dependency on our hand-written C++ code
     const utfcpp_dep = b.dependency("utfcpp", .{