From d664c8e55dc1c9c5420a66210b343bea6d6b0e16 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Mon, 18 Apr 2022 10:32:21 -0700 Subject: [PATCH] do not produce needless libraries (#220) Signed-off-by: Stephen Gutekanst --- build.zig | 11 ----------- gpu/build.zig | 18 ------------------ 2 files changed, 29 deletions(-) diff --git a/build.zig b/build.zig index a42d86f9..a8c1f81d 100644 --- a/build.zig +++ b/build.zig @@ -84,17 +84,6 @@ pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Opti .gpu_dawn_options = @bitCast(@import("gpu/libs/mach-gpu-dawn/build.zig").Options, options.gpu_dawn_options), }; - const main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/main.zig" }) catch unreachable; - const lib = b.addStaticLibrary("mach", main_abs); - lib.setBuildMode(step.build_mode); - lib.setTarget(step.target); - lib.addPackage(gpu.pkg); - lib.addPackage(glfw.pkg); - - glfw.link(b, lib, options.glfw_options); - gpu.link(b, lib, gpu_options); - lib.install(); - glfw.link(b, step, options.glfw_options); gpu.link(b, step, gpu_options); } diff --git a/gpu/build.zig b/gpu/build.zig index b73a5e8b..6a6bbba2 100644 --- a/gpu/build.zig +++ b/gpu/build.zig @@ -10,12 +10,6 @@ pub fn build(b: *std.build.Builder) void { .from_source = b.option(bool, "dawn-from-source", "Build Dawn from source") orelse false, }; - const lib = b.addStaticLibrary("gpu", "src/main.zig"); - lib.setTarget(target); - lib.setBuildMode(mode); - lib.install(); - link(b, lib, .{ .gpu_dawn_options = gpu_dawn_options }); - const main_tests = b.addTest("src/main.zig"); main_tests.setTarget(target); main_tests.setBuildMode(mode); @@ -51,18 +45,6 @@ pub const pkg = std.build.Pkg{ }; pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Options) void { - const main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/main.zig" }) catch unreachable; - const lib = b.addStaticLibrary("gpu", main_abs); - lib.setBuildMode(step.build_mode); - lib.setTarget(step.target); - - const glfw_main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/mach-glfw/src/main.zig" }) catch unreachable; - lib.addPackagePath("glfw", glfw_main_abs); - - glfw.link(b, lib, options.glfw_options); - gpu_dawn.link(b, lib, options.gpu_dawn_options); - lib.install(); - glfw.link(b, step, options.glfw_options); gpu_dawn.link(b, step, options.gpu_dawn_options); }