Imbus/pluto
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #76 from SamTebbs33/bugfix/gdb-symbol-file

Browse source 
Fix gdb symbol-file argument
This commit is contained in:
Sam Tebbs 2019-09-12 00:37:56 +01:00 committed by GitHub
commit 7cb0410f72
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build.zig
View file

@ -48,8 +48,9 @@ pub fn build(b: *Builder) !void {
grub_cmd.step.dependOn(&mkdir_cmd.step); grub_cmd.step.dependOn(&mkdir_cmd.step);
const cp_elf_cmd = b.addSystemCommand([_][]const u8{"cp"}); const cp_elf_cmd = b.addSystemCommand([_][]const u8{"cp"});
const elf_path = try fs.path.join(b.allocator, [_][]const u8{ grub_build_path, "pluto.elf" });
cp_elf_cmd.addArtifactArg(exec); cp_elf_cmd.addArtifactArg(exec);
cp_elf_cmd.addArg(try fs.path.join(b.allocator, [_][]const u8{ grub_build_path, "pluto.elf" })); cp_elf_cmd.addArg(elf_path);
cp_elf_cmd.step.dependOn(&grub_cmd.step); cp_elf_cmd.step.dependOn(&grub_cmd.step);
cp_elf_cmd.step.dependOn(&exec.step); cp_elf_cmd.step.dependOn(&exec.step);
@ -94,12 +95,12 @@ pub fn build(b: *Builder) !void {
} }
const debug_step = b.step("debug", "Debug with gdb"); const debug_step = b.step("debug", "Debug with gdb");
const symbol_file_arg = try std.mem.join(b.allocator, " ", [_][]const u8{ "symbol-file", elf_path });
const debug_cmd = b.addSystemCommand([_][]const u8{ const debug_cmd = b.addSystemCommand([_][]const u8{
"gdb", "gdb",
"-ex", "-ex",
"symbol-file", symbol_file_arg,
}); });
debug_cmd.addArtifactArg(exec);
debug_cmd.addArgs([_][]const u8{ debug_cmd.addArgs([_][]const u8{
"-ex", "-ex",
"target remote localhost:1234", "target remote localhost:1234",