From 37b6c58c3caf428d30efaf2ba71a6d9bd646e90e Mon Sep 17 00:00:00 2001
From: Sam Tebbs <samuel.tebbs@yahoo.com>
Date: Tue, 10 Sep 2019 23:08:57 +0100
Subject: [PATCH] Fix gdb symbol-file argument

---
 build.zig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.zig b/build.zig
index 41e3375..15152b2 100644
--- a/build.zig
+++ b/build.zig
@@ -48,8 +48,9 @@ pub fn build(b: *Builder) !void {
     grub_cmd.step.dependOn(&mkdir_cmd.step);
 
     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.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(&exec.step);
 
@@ -94,12 +95,12 @@ pub fn build(b: *Builder) !void {
     }
 
     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{
         "gdb",
         "-ex",
-        "symbol-file",
     });
-    debug_cmd.addArtifactArg(exec);
+    debug_cmd.addArg(symbol_file_arg);
     debug_cmd.addArgs([_][]const u8{
         "-ex",
         "target remote localhost:1234",