mirror of
https://github.com/rdmsr/zag.git
synced 2026-11-01 15:48:21 +00:00
build: fix build
This commit is contained in:
@@ -132,6 +132,8 @@ pub fn build(b: *std.Build) void {
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
rtl_tests.root_module.addImport("rtl", rtl_tests.root_module);
|
||||||
|
|
||||||
const run_tests = b.addRunArtifact(rtl_tests);
|
const run_tests = b.addRunArtifact(rtl_tests);
|
||||||
const test_step = b.step("test", "Run tests");
|
const test_step = b.step("test", "Run tests");
|
||||||
|
|
||||||
@@ -174,8 +176,7 @@ fn addKernel(b: *std.Build, plat: config.Platform, optimize: std.builtin.Optimiz
|
|||||||
switch (bl) {
|
switch (bl) {
|
||||||
.Limine => "limine",
|
.Limine => "limine",
|
||||||
}
|
}
|
||||||
else
|
else if (plat.os == .linux) "um" else @tagName(plat.arch);
|
||||||
@tagName(plat.arch);
|
|
||||||
|
|
||||||
const root_source_file = b.fmt("src/platform/{s}/entry.zig", .{platform_name});
|
const root_source_file = b.fmt("src/platform/{s}/entry.zig", .{platform_name});
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -89,7 +89,7 @@ pub fn getPlatform(config: Config) !Platform {
|
|||||||
return error.NoArchConfigured;
|
return error.NoArchConfigured;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (ret.arch == .x86_64 or ret.arch == .aarch64) {
|
if (ret.os == .freestanding and (ret.arch == .x86_64 or ret.arch == .aarch64)) {
|
||||||
ret.bootloader = blk: {
|
ret.bootloader = blk: {
|
||||||
if (config.get("CONFIG_BOOT_LIMINE")) |val| {
|
if (config.get("CONFIG_BOOT_LIMINE")) |val| {
|
||||||
if (std.mem.eql(u8, val, "y")) break :blk .Limine;
|
if (std.mem.eql(u8, val, "y")) break :blk .Limine;
|
||||||
|
|||||||
+2
-2
@@ -1,10 +1,10 @@
|
|||||||
const tagged_ptr = @import("tagged_ptr.zig");
|
const rtl = @import("rtl");
|
||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
|
|
||||||
pub const Node = struct {
|
pub const Node = struct {
|
||||||
left: *Node,
|
left: *Node,
|
||||||
right: *Node,
|
right: *Node,
|
||||||
parent: tagged_ptr.TaggedPtr(Node),
|
parent: rtl.TaggedPtr(Node),
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Base struct for binary search trees.
|
/// Base struct for binary search trees.
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ pub const pairing_heap = @import("pairing_heap.zig");
|
|||||||
pub const PairingHeap = pairing_heap.PairingHeap;
|
pub const PairingHeap = pairing_heap.PairingHeap;
|
||||||
pub const TaggedPtr = @import("tagged_ptr.zig").TaggedPtr;
|
pub const TaggedPtr = @import("tagged_ptr.zig").TaggedPtr;
|
||||||
pub const bst = @import("bst.zig");
|
pub const bst = @import("bst.zig");
|
||||||
|
pub const BST = bst.BST;
|
||||||
|
|
||||||
test {
|
test {
|
||||||
std.testing.refAllDecls(@This());
|
std.testing.refAllDecls(@This());
|
||||||
|
|||||||
Reference in New Issue
Block a user