diff --git a/src-self-hosted/link.zig b/src-self-hosted/link.zig
index 54835f9a02d4..67490b4e1f0f 100644
--- a/src-self-hosted/link.zig
+++ b/src-self-hosted/link.zig
@@ -58,7 +58,8 @@ pub fn link(comp: *Compilation) !void {
     try ctx.args.append("lld");
 
     if (comp.haveLibC()) {
-        ctx.libc = ctx.comp.override_libc orelse blk: {
+        // TODO https://github.com/ziglang/zig/issues/3190
+        var libc = ctx.comp.override_libc orelse blk: {
             switch (comp.target) {
                 Target.Native => {
                     break :blk comp.zig_compiler.getNativeLibC() catch return error.LibCRequiredButNotProvidedOrFound;
@@ -66,6 +67,7 @@ pub fn link(comp: *Compilation) !void {
                 else => return error.LibCRequiredButNotProvidedOrFound,
             }
         };
+        ctx.libc = libc;
     }
 
     try constructLinkerArgs(&ctx);
diff --git a/src-self-hosted/type.zig b/src-self-hosted/type.zig
index 2fce36aec224..90598bb59fef 100644
--- a/src-self-hosted/type.zig
+++ b/src-self-hosted/type.zig
@@ -726,8 +726,10 @@ pub const Type = struct {
             switch (key.alignment) {
                 .Abi => {},
                 .Override => |alignment| {
+                    // TODO https://github.com/ziglang/zig/issues/3190
+                    var align_spill = alignment;
                     const abi_align = try key.child_type.getAbiAlignment(comp);
-                    if (abi_align == alignment) {
+                    if (abi_align == align_spill) {
                         normal_key.alignment = .Abi;
                     }
                 },
@@ -764,6 +766,8 @@ pub const Type = struct {
                 .Volatile => "volatile ",
                 .Non => "",
             };
+            // var align_3 = self.key.alignment;
+            // const name = switch (align_3) {
             const name = switch (self.key.alignment) {
                 .Abi => try std.fmt.allocPrint(
                     comp.gpa(),