zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu-dawn: correct builds with separate_libs=true

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-02-12 23:03:56 +00:00
parent ef22780ca9
commit e3f055cf7a
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
gpu-dawn/build.zig
View file

@ -77,7 +77,7 @@ pub const Options = struct {
/// Whether or not to produce separate static libraries for each component of Dawn (reduces /// Whether or not to produce separate static libraries for each component of Dawn (reduces
/// iteration times when building from source / testing changes to Dawn source code.) /// iteration times when building from source / testing changes to Dawn source code.)
separate_libs: bool = false, separate_libs: bool = true,
/// Whether to build Dawn from source or not. /// Whether to build Dawn from source or not.
from_source: bool = false, from_source: bool = false,
@ -341,14 +341,14 @@ fn isLinuxDesktopLike(target: std.Target) bool {
} }
fn buildLibMachDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibMachDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("dawn-native-mach", main_abs); const separate_lib = b.addStaticLibrary("dawn-native-mach", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
// TODO(build-system): pass system SDK options through // TODO(build-system): pass system SDK options through
@ -371,14 +371,14 @@ fn buildLibMachDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options:
// Builds common sources; derived from src/common/BUILD.gn // Builds common sources; derived from src/common/BUILD.gn
fn buildLibDawnCommon(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibDawnCommon(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("dawn-common", main_abs); const separate_lib = b.addStaticLibrary("dawn-common", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
@ -415,14 +415,14 @@ fn buildLibDawnCommon(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
// Build dawn platform sources; derived from src/dawn_platform/BUILD.gn // Build dawn platform sources; derived from src/dawn_platform/BUILD.gn
fn buildLibDawnPlatform(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibDawnPlatform(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("dawn-platform", main_abs); const separate_lib = b.addStaticLibrary("dawn-platform", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
@ -466,14 +466,14 @@ fn appendDawnEnableBackendTypeFlags(flags: *std.ArrayList([]const u8), options:
// Builds dawn native sources; derived from src/dawn_native/BUILD.gn // Builds dawn native sources; derived from src/dawn_native/BUILD.gn
fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("dawn-native", main_abs); const separate_lib = b.addStaticLibrary("dawn-native", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
system_sdk.include(b, lib, .{}); system_sdk.include(b, lib, .{});
@ -801,14 +801,14 @@ fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
// Builds third party tint sources; derived from third_party/tint/src/BUILD.gn // Builds third party tint sources; derived from third_party/tint/src/BUILD.gn
fn buildLibTint(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibTint(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("tint", main_abs); const separate_lib = b.addStaticLibrary("tint", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
@ -924,14 +924,14 @@ fn buildLibTint(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *
// Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn // Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn
fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("spirv-tools", main_abs); const separate_lib = b.addStaticLibrary("spirv-tools", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
@ -982,14 +982,14 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
// Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn // Builds third_party/vulkan-deps/spirv-tools sources; derived from third_party/vulkan-deps/spirv-tools/src/BUILD.gn
fn buildLibSPIRVCross(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibSPIRVCross(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("spirv-cross", main_abs); const separate_lib = b.addStaticLibrary("spirv-cross", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
@ -1023,14 +1023,14 @@ fn buildLibSPIRVCross(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
// ``` // ```
// //
fn buildLibAbseilCpp(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibAbseilCpp(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("abseil-cpp-common", main_abs); const separate_lib = b.addStaticLibrary("abseil-cpp-common", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
system_sdk.include(b, lib, .{}); system_sdk.include(b, lib, .{});
@ -1057,14 +1057,14 @@ fn buildLibAbseilCpp(b: *Builder, step: *std.build.LibExeObjStep, options: Optio
// Buids dawn wire sources; derived from src/dawn_wire/BUILD.gn // Buids dawn wire sources; derived from src/dawn_wire/BUILD.gn
fn buildLibDawnWire(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibDawnWire(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("dawn-wire", main_abs); const separate_lib = b.addStaticLibrary("dawn-wire", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
@ -1083,14 +1083,14 @@ fn buildLibDawnWire(b: *Builder, step: *std.build.LibExeObjStep, options: Option
// Builds dawn utils sources; derived from src/utils/BUILD.gn // Builds dawn utils sources; derived from src/utils/BUILD.gn
fn buildLibDawnUtils(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep { fn buildLibDawnUtils(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
const lib = if (!options.separate_libs) step else { const lib = if (!options.separate_libs) step else blk: {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable; var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/dawn/dummy.zig" }) catch unreachable;
const separate_lib = b.addStaticLibrary("dawn-utils", main_abs); const separate_lib = b.addStaticLibrary("dawn-utils", main_abs);
separate_lib.install(); separate_lib.install();
separate_lib.setBuildMode(step.build_mode); separate_lib.setBuildMode(step.build_mode);
separate_lib.setTarget(step.target); separate_lib.setTarget(step.target);
separate_lib.linkLibCpp(); separate_lib.linkLibCpp();
return separate_lib; break :blk separate_lib;
}; };
glfw.link(b, lib, .{ .system_sdk = .{ .set_sysroot = false } }); glfw.link(b, lib, .{ .system_sdk = .{ .set_sysroot = false } });