Skip to content

Updated src/main.zig to work with zig 0.11.0-dev.1570+693b12f8e #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PhilippWendel wants to merge 1 commit into from
Closed

Updated src/main.zig to work with zig 0.11.0-dev.1570+693b12f8e #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pub const EmbeddedExecutable = struct {
}

pub fn setBuildMode(exe: *EmbeddedExecutable, mode: std.builtin.Mode) void {
exe.inner.setBuildMode(mode);
exe.inner.optimize = mode;
}

pub fn install(exe: *EmbeddedExecutable) void {
Expand Down Expand Up @@ -177,7 +177,7 @@ pub fn addEmbeddedExecutable(
};

var exe = EmbeddedExecutable{
.inner = builder.addExecutable(name, root_path ++ "core/microzig.zig"),
.inner = builder.addExecutable(.{ .name = name, .root_source_file = .{ .path = root_path ++ "core/microzig.zig" } }),
.app_packages = std.ArrayList(Pkg).init(builder.allocator),
};

Expand All @@ -186,7 +186,7 @@ pub fn addEmbeddedExecutable(
// might not be true for all machines (Pi Pico), but
// for the HAL it's true (it doesn't know the concept of threading)
exe.inner.single_threaded = true;
exe.inner.setTarget(chip.cpu.target);
exe.inner.target = chip.cpu.target;

const linkerscript = LinkerScriptStep.create(builder, chip) catch unreachable;
exe.inner.setLinkerScriptPath(.{ .generated = &linkerscript.generated_file });
Expand Down