diff --git a/example/mix_o_files/build.zig b/example/mix_o_files/build.zig
index 262b412f1c67496d3d98da558690e28ccca57351..e304c5e9f15570ffe4a7a5b137a45294fff1ebd2 100644
--- a/example/mix_o_files/build.zig
+++ b/example/mix_o_files/build.zig
@@ -12,7 +12,7 @@ pub fn build(b: &Builder) {
 
     b.default_step.dependOn(&exe.step);
 
-    const run_cmd = b.addCommand(b.cache_root, b.env_map, "./test", [][]const u8{});
+    const run_cmd = b.addCommand(".", b.env_map, exe.getOutputPath(), [][]const u8{});
     run_cmd.step.dependOn(&exe.step);
 
     const test_step = b.step("test", "Test the program");
diff --git a/example/shared_library/build.zig b/example/shared_library/build.zig
index cfa3340e17537cfd707fccaddf1825c613b691d8..508a2207f748aa4f30ff3fec5ebdfd41bfc2054f 100644
--- a/example/shared_library/build.zig
+++ b/example/shared_library/build.zig
@@ -12,7 +12,7 @@ pub fn build(b: &Builder) {
 
     b.default_step.dependOn(&exe.step);
 
-    const run_cmd = b.addCommand(b.cache_root, b.env_map, "./test", [][]const u8{});
+    const run_cmd = b.addCommand(".", b.env_map, exe.getOutputPath(), [][]const u8{});
     run_cmd.step.dependOn(&exe.step);
 
     const test_step = b.step("test", "Test the program");
diff --git a/std/build.zig b/std/build.zig
index 40ddc7f4acb867c02f7d7b7571f83d4c730397c0..90f444f30b755b7f1e727f527ec1333fd2364356 100644
--- a/std/build.zig
+++ b/std/build.zig
@@ -505,7 +505,6 @@ pub const Builder = struct {
         };
 
         const term = child.wait() %% |err| {
-            test (cwd) |yes_cwd| %%io.stderr.printf("cwd: {}\n", yes_cwd);
             %%io.stderr.printf("Unable to spawn {}: {}\n", exe_path, @errorName(err));
             return err;
         };
@@ -1213,11 +1212,11 @@ pub const CLibExeObjStep = struct {
                         %%cc_args.append("-fPIC");
                     }
 
+                    const abs_source_file = builder.pathFromRoot(source_file);
                     %%cc_args.append("-c");
-                    %%cc_args.append(source_file);
+                    %%cc_args.append(abs_source_file);
 
-                    const rel_src_path = %%os.path.relative(builder.allocator, builder.build_root, source_file);
-                    const cache_o_src = %%os.path.join(builder.allocator, builder.cache_root, rel_src_path);
+                    const cache_o_src = %%os.path.join(builder.allocator, builder.cache_root, source_file);
                     const cache_o_dir = os.path.dirname(cache_o_src);
                     %return builder.makePath(cache_o_dir);
                     const cache_o_file = builder.fmt("{}{}", cache_o_src, self.target.oFileExt());
@@ -1230,7 +1229,7 @@ pub const CLibExeObjStep = struct {
 
                     for (self.include_dirs.toSliceConst()) |dir| {
                         %%cc_args.append("-I");
-                        %%cc_args.append(dir);
+                        %%cc_args.append(builder.pathFromRoot(dir));
                     }
 
                     %return builder.spawnChild(cc, cc_args.toSliceConst());
@@ -1279,11 +1278,11 @@ pub const CLibExeObjStep = struct {
                 for (self.source_files.toSliceConst()) |source_file| {
                     %%cc_args.resize(0);
 
+                    const abs_source_file = builder.pathFromRoot(source_file);
                     %%cc_args.append("-c");
-                    %%cc_args.append(builder.pathFromRoot(source_file));
+                    %%cc_args.append(abs_source_file);
 
-                    const rel_src_path = %%os.path.relative(builder.allocator, builder.build_root, source_file);
-                    const cache_o_src = %%os.path.join(builder.allocator, builder.cache_root, rel_src_path);
+                    const cache_o_src = %%os.path.join(builder.allocator, builder.cache_root, source_file);
                     const cache_o_dir = os.path.dirname(cache_o_src);
                     %return builder.makePath(cache_o_dir);
                     const cache_o_file = builder.fmt("{}{}", cache_o_src, self.target.oFileExt());
@@ -1324,6 +1323,8 @@ pub const CLibExeObjStep = struct {
                 for (self.full_path_libs.toSliceConst()) |full_path_lib| {
                     %%cc_args.append(builder.pathFromRoot(full_path_lib));
                 }
+
+                %return builder.spawnChild(cc, cc_args.toSliceConst());
             },
         }
     }