378 files changed, 42 insertions, 83 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7fecfa51c..2482a61601 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -601,8 +601,7 @@ else()
 endif()
 add_custom_target(zig_build_libuserland ALL
     COMMAND zig0 build
-        --override-std-dir std
-        --override-lib-dir "${CMAKE_SOURCE_DIR}"
+        --override-lib-dir "${CMAKE_SOURCE_DIR}/lib"
         libuserland install
         "-Doutput-dir=${CMAKE_BINARY_DIR}"
         "-Drelease=${LIBUSERLAND_RELEASE_MODE}"
diff --git a/build.zig b/build.zig
index b38fb87cb7..390f1594f8 100644
--- a/build.zig
+++ b/build.zig
@@ -87,11 +87,6 @@ pub fn build(b: *Builder) !void {
         .source_dir = "lib",
         .install_dir = .Lib,
         .install_subdir = "zig",
-    });
-    b.installDirectory(InstallDirectoryOptions{
-        .source_dir = "std",
-        .install_dir = .Lib,
-        .install_subdir = "zig" ++ fs.path.sep_str ++ "std",
         .exclude_extensions = [_][]const u8{ "test.zig", "README.md" },
     });
 
@@ -134,9 +129,9 @@ pub fn build(b: *Builder) !void {
 
     test_step.dependOn(tests.addPkgTests(b, test_filter, "test/stage1/behavior.zig", "behavior", "Run the behavior tests", modes, false, skip_non_native, skip_libc, is_wine_enabled, is_qemu_enabled, glibc_multi_dir));
 
-    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/std.zig", "std", "Run the standard library tests", modes, false, skip_non_native, skip_libc, is_wine_enabled, is_qemu_enabled, glibc_multi_dir));
+    test_step.dependOn(tests.addPkgTests(b, test_filter, "lib/std/std.zig", "std", "Run the standard library tests", modes, false, skip_non_native, skip_libc, is_wine_enabled, is_qemu_enabled, glibc_multi_dir));
 
-    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt.zig", "compiler-rt", "Run the compiler_rt tests", modes, true, skip_non_native, true, is_wine_enabled, is_qemu_enabled, glibc_multi_dir));
+    test_step.dependOn(tests.addPkgTests(b, test_filter, "lib/std/special/compiler_rt.zig", "compiler-rt", "Run the compiler_rt tests", modes, true, skip_non_native, true, is_wine_enabled, is_qemu_enabled, glibc_multi_dir));
 
     test_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes));
     test_step.dependOn(tests.addStandaloneTests(b, test_filter, modes));
diff --git a/std/array_list.zig b/lib/std/array_list.zig
index 31ae02b291..31ae02b291 100644
--- a/std/array_list.zig
+++ b/lib/std/array_list.zig
diff --git a/std/ascii.zig b/lib/std/ascii.zig
index 2bc11ba3f2..2bc11ba3f2 100644
--- a/std/ascii.zig
+++ b/lib/std/ascii.zig
diff --git a/std/atomic.zig b/lib/std/atomic.zig
index 6f7b4fe75d..6f7b4fe75d 100644
--- a/std/atomic.zig
+++ b/lib/std/atomic.zig
diff --git a/std/atomic/int.zig b/lib/std/atomic/int.zig
index 94985b914f..94985b914f 100644
--- a/std/atomic/int.zig
+++ b/lib/std/atomic/int.zig
diff --git a/std/atomic/queue.zig b/lib/std/atomic/queue.zig
index dbc011bed3..dbc011bed3 100644
--- a/std/atomic/queue.zig
+++ b/lib/std/atomic/queue.zig
diff --git a/std/atomic/stack.zig b/lib/std/atomic/stack.zig
index dd288adbf1..dd288adbf1 100644
--- a/std/atomic/stack.zig
+++ b/lib/std/atomic/stack.zig
diff --git a/std/base64.zig b/lib/std/base64.zig
index 39ad811eb6..39ad811eb6 100644
--- a/std/base64.zig
+++ b/lib/std/base64.zig
diff --git a/std/bloom_filter.zig b/lib/std/bloom_filter.zig
index c36c5e9dfa..c36c5e9dfa 100644
--- a/std/bloom_filter.zig
+++ b/lib/std/bloom_filter.zig
diff --git a/std/buf_map.zig b/lib/std/buf_map.zig
index d7aa314157..d7aa314157 100644
--- a/std/buf_map.zig
+++ b/lib/std/buf_map.zig
diff --git a/std/buf_set.zig b/lib/std/buf_set.zig
index 1a321e89c9..1a321e89c9 100644
--- a/std/buf_set.zig
+++ b/lib/std/buf_set.zig
diff --git a/std/buffer.zig b/lib/std/buffer.zig
index bc6aa254da..bc6aa254da 100644
--- a/std/buffer.zig
+++ b/lib/std/buffer.zig
diff --git a/std/build.zig b/lib/std/build.zig
index 7f9a77351d..3b5299f523 100644
--- a/std/build.zig
+++ b/lib/std/build.zig
@@ -52,7 +52,6 @@ pub const Builder = struct {
     cache_root: []const u8,
     release_mode: ?builtin.Mode,
     is_release: bool,
-    override_std_dir: ?[]const u8,
     override_lib_dir: ?[]const u8,
 
     pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,
@@ -158,7 +157,6 @@ pub const Builder = struct {
             },
             .release_mode = null,
             .is_release = false,
-            .override_std_dir = null,
             .override_lib_dir = null,
             .install_path = undefined,
         };
@@ -1439,7 +1437,6 @@ pub const LibExeObjStep = struct {
     bundle_compiler_rt: bool,
     disable_stack_probing: bool,
     c_std: Builder.CStd,
-    override_std_dir: ?[]const u8,
     override_lib_dir: ?[]const u8,
     main_pkg_path: ?[]const u8,
     exec_cmd_args: ?[]const ?[]const u8,
@@ -1570,7 +1567,6 @@ pub const LibExeObjStep = struct {
             .build_options_contents = std.Buffer.initSize(builder.allocator, 0) catch unreachable,
             .c_std = Builder.CStd.C99,
             .system_linker_hack = false,
-            .override_std_dir = null,
             .override_lib_dir = null,
             .main_pkg_path = null,
             .exec_cmd_args = null,
@@ -1883,8 +1879,8 @@ pub const LibExeObjStep = struct {
         self.build_mode = mode;
     }
 
-    pub fn overrideStdDir(self: *LibExeObjStep, dir_path: []const u8) void {
-        self.override_std_dir = dir_path;
+    pub fn overrideZigLibDir(self: *LibExeObjStep, dir_path: []const u8) void {
+        self.override_lib_dir = self.builder.dupe(dir_path);
     }
 
     pub fn setMainPkgPath(self: *LibExeObjStep, dir_path: []const u8) void {
@@ -2300,14 +2296,6 @@ pub const LibExeObjStep = struct {
             }
         }
 
-        if (self.override_std_dir) |dir| {
-            try zig_args.append("--override-std-dir");
-            try zig_args.append(builder.pathFromRoot(dir));
-        } else if (self.builder.override_std_dir) |dir| {
-            try zig_args.append("--override-std-dir");
-            try zig_args.append(builder.pathFromRoot(dir));
-        }
-
         if (self.override_lib_dir) |dir| {
             try zig_args.append("--override-lib-dir");
             try zig_args.append(builder.pathFromRoot(dir));
diff --git a/std/build/fmt.zig b/lib/std/build/fmt.zig
index f3b8e08180..f3b8e08180 100644
--- a/std/build/fmt.zig
+++ b/lib/std/build/fmt.zig
diff --git a/std/c.zig b/lib/std/c.zig
index 9c7ec2f0e5..9c7ec2f0e5 100644
--- a/std/c.zig
+++ b/lib/std/c.zig
diff --git a/std/c/darwin.zig b/lib/std/c/darwin.zig
index f2e8120a0e..f2e8120a0e 100644
--- a/std/c/darwin.zig
+++ b/lib/std/c/darwin.zig
diff --git a/std/c/freebsd.zig b/lib/std/c/freebsd.zig
index 550b5a59b1..550b5a59b1 100644
--- a/std/c/freebsd.zig
+++ b/lib/std/c/freebsd.zig
diff --git a/std/c/linux.zig b/lib/std/c/linux.zig
index b3b3cbdde7..b3b3cbdde7 100644
--- a/std/c/linux.zig
+++ b/lib/std/c/linux.zig
diff --git a/std/c/netbsd.zig b/lib/std/c/netbsd.zig
index 417c78db69..417c78db69 100644
--- a/std/c/netbsd.zig
+++ b/lib/std/c/netbsd.zig
diff --git a/std/c/windows.zig b/lib/std/c/windows.zig
index 35ca217131..35ca217131 100644
--- a/std/c/windows.zig
+++ b/lib/std/c/windows.zig
diff --git a/std/child_process.zig b/lib/std/child_process.zig
index 9094f1cb57..9094f1cb57 100644
--- a/std/child_process.zig
+++ b/lib/std/child_process.zig
diff --git a/std/coff.zig b/lib/std/coff.zig
index 3890151d09..3890151d09 100644
--- a/std/coff.zig
+++ b/lib/std/coff.zig
diff --git a/std/crypto.zig b/lib/std/crypto.zig
index b7703f2f7a..b7703f2f7a 100644
--- a/std/crypto.zig
+++ b/lib/std/crypto.zig
diff --git a/std/crypto/benchmark.zig b/lib/std/crypto/benchmark.zig
index ae5087a847..ae5087a847 100644
--- a/std/crypto/benchmark.zig
+++ b/lib/std/crypto/benchmark.zig
diff --git a/std/crypto/blake2.zig b/lib/std/crypto/blake2.zig
index 6bb2764b92..6bb2764b92 100644
--- a/std/crypto/blake2.zig
+++ b/lib/std/crypto/blake2.zig
diff --git a/std/crypto/chacha20.zig b/lib/std/crypto/chacha20.zig
index 0d997e0d14..0d997e0d14 100644
--- a/std/crypto/chacha20.zig
+++ b/lib/std/crypto/chacha20.zig
diff --git a/std/crypto/gimli.zig b/lib/std/crypto/gimli.zig
index 0a0a5056c6..0a0a5056c6 100644
--- a/std/crypto/gimli.zig
+++ b/lib/std/crypto/gimli.zig
diff --git a/std/crypto/hmac.zig b/lib/std/crypto/hmac.zig
index 69c1b86386..69c1b86386 100644
--- a/std/crypto/hmac.zig
+++ b/lib/std/crypto/hmac.zig
diff --git a/std/crypto/md5.zig b/lib/std/crypto/md5.zig
index ddbb39a9df..ddbb39a9df 100644
--- a/std/crypto/md5.zig
+++ b/lib/std/crypto/md5.zig
diff --git a/std/crypto/poly1305.zig b/lib/std/crypto/poly1305.zig
index bd0b33e586..bd0b33e586 100644
--- a/std/crypto/poly1305.zig
+++ b/lib/std/crypto/poly1305.zig
diff --git a/std/crypto/sha1.zig b/lib/std/crypto/sha1.zig
index c5160a1f37..c5160a1f37 100644
--- a/std/crypto/sha1.zig
+++ b/lib/std/crypto/sha1.zig
diff --git a/std/crypto/sha2.zig b/lib/std/crypto/sha2.zig
index b40a39d579..b40a39d579 100644
--- a/std/crypto/sha2.zig
+++ b/lib/std/crypto/sha2.zig
diff --git a/std/crypto/sha3.zig b/lib/std/crypto/sha3.zig
index 659e7a254f..659e7a254f 100644
--- a/std/crypto/sha3.zig
+++ b/lib/std/crypto/sha3.zig
diff --git a/std/crypto/test.zig b/lib/std/crypto/test.zig
index a0ddad6c83..a0ddad6c83 100644
--- a/std/crypto/test.zig
+++ b/lib/std/crypto/test.zig
diff --git a/std/crypto/x25519.zig b/lib/std/crypto/x25519.zig
index 7f9220c3f4..7f9220c3f4 100644
--- a/std/crypto/x25519.zig
+++ b/lib/std/crypto/x25519.zig
diff --git a/std/cstr.zig b/lib/std/cstr.zig
index dd28e50449..dd28e50449 100644
--- a/std/cstr.zig
+++ b/lib/std/cstr.zig
diff --git a/std/debug.zig b/lib/std/debug.zig
index 52f33660fb..52f33660fb 100644
--- a/std/debug.zig
+++ b/lib/std/debug.zig
diff --git a/std/debug/failing_allocator.zig b/lib/std/debug/failing_allocator.zig
index 5776d23194..5776d23194 100644
--- a/std/debug/failing_allocator.zig
+++ b/lib/std/debug/failing_allocator.zig
diff --git a/std/debug/leb128.zig b/lib/std/debug/leb128.zig
index cb59c5b0d2..cb59c5b0d2 100644
--- a/std/debug/leb128.zig
+++ b/lib/std/debug/leb128.zig
diff --git a/std/dwarf.zig b/lib/std/dwarf.zig
index 2f3b29302d..2f3b29302d 100644
--- a/std/dwarf.zig
+++ b/lib/std/dwarf.zig
diff --git a/std/dynamic_library.zig b/lib/std/dynamic_library.zig
index 3413788019..3413788019 100644
--- a/std/dynamic_library.zig
+++ b/lib/std/dynamic_library.zig
diff --git a/std/elf.zig b/lib/std/elf.zig
index 37635895fd..37635895fd 100644
--- a/std/elf.zig
+++ b/lib/std/elf.zig
diff --git a/std/event.zig b/lib/std/event.zig
index 56c5223ba3..56c5223ba3 100644
--- a/std/event.zig
+++ b/lib/std/event.zig
diff --git a/std/event/channel.zig b/lib/std/event/channel.zig
index 2f211d21e2..2f211d21e2 100644
--- a/std/event/channel.zig
+++ b/lib/std/event/channel.zig
diff --git a/std/event/fs.zig b/lib/std/event/fs.zig
index 4490e1deae..4490e1deae 100644
--- a/std/event/fs.zig
+++ b/lib/std/event/fs.zig
diff --git a/std/event/future.zig b/lib/std/event/future.zig
index 1e3508de41..1e3508de41 100644
--- a/std/event/future.zig
+++ b/lib/std/event/future.zig
diff --git a/std/event/group.zig b/lib/std/event/group.zig
index f96b938f80..f96b938f80 100644
--- a/std/event/group.zig
+++ b/lib/std/event/group.zig
diff --git a/std/event/lock.zig b/lib/std/event/lock.zig
index a0b1fd3e50..a0b1fd3e50 100644
--- a/std/event/lock.zig
+++ b/lib/std/event/lock.zig
diff --git a/std/event/locked.zig b/lib/std/event/locked.zig
index aeedf3558a..aeedf3558a 100644
--- a/std/event/locked.zig
+++ b/lib/std/event/locked.zig
diff --git a/std/event/loop.zig b/lib/std/event/loop.zig
index d0d36abc0c..d0d36abc0c 100644
--- a/std/event/loop.zig
+++ b/lib/std/event/loop.zig
diff --git a/std/event/net.zig b/lib/std/event/net.zig
index bed665dcdc..bed665dcdc 100644
--- a/std/event/net.zig
+++ b/lib/std/event/net.zig
diff --git a/std/event/rwlock.zig b/lib/std/event/rwlock.zig
index bf7ea0fa9f..bf7ea0fa9f 100644
--- a/std/event/rwlock.zig
+++ b/lib/std/event/rwlock.zig
diff --git a/std/event/rwlocked.zig b/lib/std/event/rwlocked.zig
index 386aa08407..386aa08407 100644
--- a/std/event/rwlocked.zig
+++ b/lib/std/event/rwlocked.zig
diff --git a/std/fmt.zig b/lib/std/fmt.zig
index 3f3e3fca73..3f3e3fca73 100644
--- a/std/fmt.zig
+++ b/lib/std/fmt.zig
diff --git a/std/fmt/errol.zig b/lib/std/fmt/errol.zig
index a835195fc7..a835195fc7 100644
--- a/std/fmt/errol.zig
+++ b/lib/std/fmt/errol.zig
diff --git a/std/fmt/errol/enum3.zig b/lib/std/fmt/errol/enum3.zig
index c27753483d..c27753483d 100644
--- a/std/fmt/errol/enum3.zig
+++ b/lib/std/fmt/errol/enum3.zig
diff --git a/std/fmt/errol/lookup.zig b/lib/std/fmt/errol/lookup.zig
index 2fb6b167bb..2fb6b167bb 100644
--- a/std/fmt/errol/lookup.zig
+++ b/lib/std/fmt/errol/lookup.zig
diff --git a/std/fmt/parse_float.zig b/lib/std/fmt/parse_float.zig
index 9a35e27c21..9a35e27c21 100644
--- a/std/fmt/parse_float.zig
+++ b/lib/std/fmt/parse_float.zig
diff --git a/std/fs.zig b/lib/std/fs.zig
index 6301c8a26c..6301c8a26c 100644
--- a/std/fs.zig
+++ b/lib/std/fs.zig
diff --git a/std/fs/file.zig b/lib/std/fs/file.zig
index 5ecad01026..5ecad01026 100644
--- a/std/fs/file.zig
+++ b/lib/std/fs/file.zig
diff --git a/std/fs/get_app_data_dir.zig b/lib/std/fs/get_app_data_dir.zig
index cdab7703f8..cdab7703f8 100644
--- a/std/fs/get_app_data_dir.zig
+++ b/lib/std/fs/get_app_data_dir.zig
diff --git a/std/fs/path.zig b/lib/std/fs/path.zig
index 2bb23f04ce..2bb23f04ce 100644
--- a/std/fs/path.zig
+++ b/lib/std/fs/path.zig
diff --git a/std/hash.zig b/lib/std/hash.zig
index ab3a0ea8f3..ab3a0ea8f3 100644
--- a/std/hash.zig
+++ b/lib/std/hash.zig
diff --git a/std/hash/adler.zig b/lib/std/hash/adler.zig
index 3cc3171e49..3cc3171e49 100644
--- a/std/hash/adler.zig
+++ b/lib/std/hash/adler.zig
diff --git a/std/hash/auto_hash.zig b/lib/std/hash/auto_hash.zig
index 8a22788e5c..8a22788e5c 100644
--- a/std/hash/auto_hash.zig
+++ b/lib/std/hash/auto_hash.zig
diff --git a/std/hash/benchmark.zig b/lib/std/hash/benchmark.zig
index d110684a8e..d110684a8e 100644
--- a/std/hash/benchmark.zig
+++ b/lib/std/hash/benchmark.zig
diff --git a/std/hash/cityhash.zig b/lib/std/hash/cityhash.zig
index 43e5b7a385..43e5b7a385 100644
--- a/std/hash/cityhash.zig
+++ b/lib/std/hash/cityhash.zig
diff --git a/std/hash/crc.zig b/lib/std/hash/crc.zig
index cdcaf55610..cdcaf55610 100644
--- a/std/hash/crc.zig
+++ b/lib/std/hash/crc.zig
diff --git a/std/hash/fnv.zig b/lib/std/hash/fnv.zig
index 8094134e19..8094134e19 100644
--- a/std/hash/fnv.zig
+++ b/lib/std/hash/fnv.zig
diff --git a/std/hash/murmur.zig b/lib/std/hash/murmur.zig
index a0c8f91338..a0c8f91338 100644
--- a/std/hash/murmur.zig
+++ b/lib/std/hash/murmur.zig
diff --git a/std/hash/siphash.zig b/lib/std/hash/siphash.zig
index 3d67ba685b..3d67ba685b 100644
--- a/std/hash/siphash.zig
+++ b/lib/std/hash/siphash.zig
diff --git a/std/hash/wyhash.zig b/lib/std/hash/wyhash.zig
index 7e35ccc6d2..7e35ccc6d2 100644
--- a/std/hash/wyhash.zig
+++ b/lib/std/hash/wyhash.zig
diff --git a/std/hash_map.zig b/lib/std/hash_map.zig
index 4ffe88067b..4ffe88067b 100644
--- a/std/hash_map.zig
+++ b/lib/std/hash_map.zig
diff --git a/std/heap.zig b/lib/std/heap.zig
index b968b6242f..b968b6242f 100644
--- a/std/heap.zig
+++ b/lib/std/heap.zig
diff --git a/std/heap/logging_allocator.zig b/lib/std/heap/logging_allocator.zig
index c1f09a1aad..c1f09a1aad 100644
--- a/std/heap/logging_allocator.zig
+++ b/lib/std/heap/logging_allocator.zig
diff --git a/std/http.zig b/lib/std/http.zig
index acb005a75f..acb005a75f 100644
--- a/std/http.zig
+++ b/lib/std/http.zig
diff --git a/std/http/headers.zig b/lib/std/http/headers.zig
index a8dfa68629..a8dfa68629 100644
--- a/std/http/headers.zig
+++ b/lib/std/http/headers.zig
diff --git a/std/io.zig b/lib/std/io.zig
index 25106e24be..25106e24be 100644
--- a/std/io.zig
+++ b/lib/std/io.zig
diff --git a/std/io/c_out_stream.zig b/lib/std/io/c_out_stream.zig
index 8b341e6937..8b341e6937 100644
--- a/std/io/c_out_stream.zig
+++ b/lib/std/io/c_out_stream.zig
diff --git a/std/io/in_stream.zig b/lib/std/io/in_stream.zig
index 44c74fcca4..44c74fcca4 100644
--- a/std/io/in_stream.zig
+++ b/lib/std/io/in_stream.zig
diff --git a/std/io/seekable_stream.zig b/lib/std/io/seekable_stream.zig
index 86f76d8c14..86f76d8c14 100644
--- a/std/io/seekable_stream.zig
+++ b/lib/std/io/seekable_stream.zig
diff --git a/std/io/test.zig b/lib/std/io/test.zig
index 537a0b9719..537a0b9719 100644
--- a/std/io/test.zig
+++ b/lib/std/io/test.zig
diff --git a/std/json.zig b/lib/std/json.zig
index f562a672f8..f562a672f8 100644
--- a/std/json.zig
+++ b/lib/std/json.zig
diff --git a/std/json/test.zig b/lib/std/json/test.zig
index 7c89dcd123..7c89dcd123 100644
--- a/std/json/test.zig
+++ b/lib/std/json/test.zig
diff --git a/std/lazy_init.zig b/lib/std/lazy_init.zig
index 7beabb9cde..7beabb9cde 100644
--- a/std/lazy_init.zig
+++ b/lib/std/lazy_init.zig
diff --git a/std/linked_list.zig b/lib/std/linked_list.zig
index 6495653150..6495653150 100644
--- a/std/linked_list.zig
+++ b/lib/std/linked_list.zig
diff --git a/std/macho.zig b/lib/std/macho.zig
index e1bbd755c6..e1bbd755c6 100644
--- a/std/macho.zig
+++ b/lib/std/macho.zig
diff --git a/std/math.zig b/lib/std/math.zig
index e47021512e..e47021512e 100644
--- a/std/math.zig
+++ b/lib/std/math.zig
diff --git a/std/math/acos.zig b/lib/std/math/acos.zig
index de07da8fe0..de07da8fe0 100644
--- a/std/math/acos.zig
+++ b/lib/std/math/acos.zig
diff --git a/std/math/acosh.zig b/lib/std/math/acosh.zig
index 503c0433fc..503c0433fc 100644
--- a/std/math/acosh.zig
+++ b/lib/std/math/acosh.zig
diff --git a/std/math/asin.zig b/lib/std/math/asin.zig
index 2db9f86ff1..2db9f86ff1 100644
--- a/std/math/asin.zig
+++ b/lib/std/math/asin.zig
diff --git a/std/math/asinh.zig b/lib/std/math/asinh.zig
index 0fb51d1b43..0fb51d1b43 100644
--- a/std/math/asinh.zig
+++ b/lib/std/math/asinh.zig
diff --git a/std/math/atan.zig b/lib/std/math/atan.zig
index 5790eba8cf..5790eba8cf 100644
--- a/std/math/atan.zig
+++ b/lib/std/math/atan.zig
diff --git a/std/math/atan2.zig b/lib/std/math/atan2.zig
index 68e381607d..68e381607d 100644
--- a/std/math/atan2.zig
+++ b/lib/std/math/atan2.zig
diff --git a/std/math/atanh.zig b/lib/std/math/atanh.zig
index 8ba29be761..8ba29be761 100644
--- a/std/math/atanh.zig
+++ b/lib/std/math/atanh.zig
diff --git a/std/math/big.zig b/lib/std/math/big.zig
index 8105beb506..8105beb506 100644
--- a/std/math/big.zig
+++ b/lib/std/math/big.zig
diff --git a/std/math/big/int.zig b/lib/std/math/big/int.zig
index 8a6f6c1f75..8a6f6c1f75 100644
--- a/std/math/big/int.zig
+++ b/lib/std/math/big/int.zig
diff --git a/std/math/big/rational.zig b/lib/std/math/big/rational.zig
index 6a51931e3c..6a51931e3c 100644
--- a/std/math/big/rational.zig
+++ b/lib/std/math/big/rational.zig
diff --git a/std/math/cbrt.zig b/lib/std/math/cbrt.zig
index 5241e31323..5241e31323 100644
--- a/std/math/cbrt.zig
+++ b/lib/std/math/cbrt.zig
diff --git a/std/math/ceil.zig b/lib/std/math/ceil.zig
index 5f86093a6d..5f86093a6d 100644
--- a/std/math/ceil.zig
+++ b/lib/std/math/ceil.zig
diff --git a/std/math/complex.zig b/lib/std/math/complex.zig
index e5574f9cee..e5574f9cee 100644
--- a/std/math/complex.zig
+++ b/lib/std/math/complex.zig
diff --git a/std/math/complex/abs.zig b/lib/std/math/complex/abs.zig
index 8105f57218..8105f57218 100644
--- a/std/math/complex/abs.zig
+++ b/lib/std/math/complex/abs.zig
diff --git a/std/math/complex/acos.zig b/lib/std/math/complex/acos.zig
index f3526cc9ff..f3526cc9ff 100644
--- a/std/math/complex/acos.zig
+++ b/lib/std/math/complex/acos.zig
diff --git a/std/math/complex/acosh.zig b/lib/std/math/complex/acosh.zig
index 6f0fd2e36c..6f0fd2e36c 100644
--- a/std/math/complex/acosh.zig
+++ b/lib/std/math/complex/acosh.zig
diff --git a/std/math/complex/arg.zig b/lib/std/math/complex/arg.zig
index d0c9588b8d..d0c9588b8d 100644
--- a/std/math/complex/arg.zig
+++ b/lib/std/math/complex/arg.zig
diff --git a/std/math/complex/asin.zig b/lib/std/math/complex/asin.zig
index 76f94a286c..76f94a286c 100644
--- a/std/math/complex/asin.zig
+++ b/lib/std/math/complex/asin.zig
diff --git a/std/math/complex/asinh.zig b/lib/std/math/complex/asinh.zig
index da065aad01..da065aad01 100644
--- a/std/math/complex/asinh.zig
+++ b/lib/std/math/complex/asinh.zig
diff --git a/std/math/complex/atan.zig b/lib/std/math/complex/atan.zig
index 3cd19961c8..3cd19961c8 100644
--- a/std/math/complex/atan.zig
+++ b/lib/std/math/complex/atan.zig
diff --git a/std/math/complex/atanh.zig b/lib/std/math/complex/atanh.zig
index 225e7c61de..225e7c61de 100644
--- a/std/math/complex/atanh.zig
+++ b/lib/std/math/complex/atanh.zig
diff --git a/std/math/complex/conj.zig b/lib/std/math/complex/conj.zig
index bd71ca3c06..bd71ca3c06 100644
--- a/std/math/complex/conj.zig
+++ b/lib/std/math/complex/conj.zig
diff --git a/std/math/complex/cos.zig b/lib/std/math/complex/cos.zig
index 332009ffe5..332009ffe5 100644
--- a/std/math/complex/cos.zig
+++ b/lib/std/math/complex/cos.zig
diff --git a/std/math/complex/cosh.zig b/lib/std/math/complex/cosh.zig
index 89afcac42e..89afcac42e 100644
--- a/std/math/complex/cosh.zig
+++ b/lib/std/math/complex/cosh.zig
diff --git a/std/math/complex/exp.zig b/lib/std/math/complex/exp.zig
index 5cd1cb4ed6..5cd1cb4ed6 100644
--- a/std/math/complex/exp.zig
+++ b/lib/std/math/complex/exp.zig
diff --git a/std/math/complex/ldexp.zig b/lib/std/math/complex/ldexp.zig
index d6f810793f..d6f810793f 100644
--- a/std/math/complex/ldexp.zig
+++ b/lib/std/math/complex/ldexp.zig
diff --git a/std/math/complex/log.zig b/lib/std/math/complex/log.zig
index 762b4fde9a..762b4fde9a 100644
--- a/std/math/complex/log.zig
+++ b/lib/std/math/complex/log.zig
diff --git a/std/math/complex/pow.zig b/lib/std/math/complex/pow.zig
index a2480453fc..a2480453fc 100644
--- a/std/math/complex/pow.zig
+++ b/lib/std/math/complex/pow.zig
diff --git a/std/math/complex/proj.zig b/lib/std/math/complex/proj.zig
index c8f2d9fc6d..c8f2d9fc6d 100644
--- a/std/math/complex/proj.zig
+++ b/lib/std/math/complex/proj.zig
diff --git a/std/math/complex/sin.zig b/lib/std/math/complex/sin.zig
index 9ddc3a7a80..9ddc3a7a80 100644
--- a/std/math/complex/sin.zig
+++ b/lib/std/math/complex/sin.zig
diff --git a/std/math/complex/sinh.zig b/lib/std/math/complex/sinh.zig
index 0b1294bb6a..0b1294bb6a 100644
--- a/std/math/complex/sinh.zig
+++ b/lib/std/math/complex/sinh.zig
diff --git a/std/math/complex/sqrt.zig b/lib/std/math/complex/sqrt.zig
index 36f4c28e29..36f4c28e29 100644
--- a/std/math/complex/sqrt.zig
+++ b/lib/std/math/complex/sqrt.zig
diff --git a/std/math/complex/tan.zig b/lib/std/math/complex/tan.zig
index 398b8295ca..398b8295ca 100644
--- a/std/math/complex/tan.zig
+++ b/lib/std/math/complex/tan.zig
diff --git a/std/math/complex/tanh.zig b/lib/std/math/complex/tanh.zig
index 6895e8a769..6895e8a769 100644
--- a/std/math/complex/tanh.zig
+++ b/lib/std/math/complex/tanh.zig
diff --git a/std/math/copysign.zig b/lib/std/math/copysign.zig
index e4d90c395e..e4d90c395e 100644
--- a/std/math/copysign.zig
+++ b/lib/std/math/copysign.zig
diff --git a/std/math/cos.zig b/lib/std/math/cos.zig
index 5261a25f80..5261a25f80 100644
--- a/std/math/cos.zig
+++ b/lib/std/math/cos.zig
diff --git a/std/math/cosh.zig b/lib/std/math/cosh.zig
index 75c5c15ec1..75c5c15ec1 100644
--- a/std/math/cosh.zig
+++ b/lib/std/math/cosh.zig
diff --git a/std/math/exp.zig b/lib/std/math/exp.zig
index 718bbcd476..718bbcd476 100644
--- a/std/math/exp.zig
+++ b/lib/std/math/exp.zig
diff --git a/std/math/exp2.zig b/lib/std/math/exp2.zig
index 57f6620d77..57f6620d77 100644
--- a/std/math/exp2.zig
+++ b/lib/std/math/exp2.zig
diff --git a/std/math/expm1.zig b/lib/std/math/expm1.zig
index 5e347f86f6..5e347f86f6 100644
--- a/std/math/expm1.zig
+++ b/lib/std/math/expm1.zig
diff --git a/std/math/expo2.zig b/lib/std/math/expo2.zig
index c00098a5a7..c00098a5a7 100644
--- a/std/math/expo2.zig
+++ b/lib/std/math/expo2.zig
diff --git a/std/math/fabs.zig b/lib/std/math/fabs.zig
index 6469f38835..6469f38835 100644
--- a/std/math/fabs.zig
+++ b/lib/std/math/fabs.zig
diff --git a/std/math/floor.zig b/lib/std/math/floor.zig
index e5ff2b1fc1..e5ff2b1fc1 100644
--- a/std/math/floor.zig
+++ b/lib/std/math/floor.zig
diff --git a/std/math/fma.zig b/lib/std/math/fma.zig
index 19c306fa2a..19c306fa2a 100644
--- a/std/math/fma.zig
+++ b/lib/std/math/fma.zig
diff --git a/std/math/frexp.zig b/lib/std/math/frexp.zig
index 2759cd6492..2759cd6492 100644
--- a/std/math/frexp.zig
+++ b/lib/std/math/frexp.zig
diff --git a/std/math/hypot.zig b/lib/std/math/hypot.zig
index c15da1495e..c15da1495e 100644
--- a/std/math/hypot.zig
+++ b/lib/std/math/hypot.zig
diff --git a/std/math/ilogb.zig b/lib/std/math/ilogb.zig
index fe4158a6dd..fe4158a6dd 100644
--- a/std/math/ilogb.zig
+++ b/lib/std/math/ilogb.zig
diff --git a/std/math/inf.zig b/lib/std/math/inf.zig
index 86ff245533..86ff245533 100644
--- a/std/math/inf.zig
+++ b/lib/std/math/inf.zig
diff --git a/std/math/isfinite.zig b/lib/std/math/isfinite.zig
index 99eba668f9..99eba668f9 100644
--- a/std/math/isfinite.zig
+++ b/lib/std/math/isfinite.zig
diff --git a/std/math/isinf.zig b/lib/std/math/isinf.zig
index 37934f4cf4..37934f4cf4 100644
--- a/std/math/isinf.zig
+++ b/lib/std/math/isinf.zig
diff --git a/std/math/isnan.zig b/lib/std/math/isnan.zig
index cf8cd2e1c2..cf8cd2e1c2 100644
--- a/std/math/isnan.zig
+++ b/lib/std/math/isnan.zig
diff --git a/std/math/isnormal.zig b/lib/std/math/isnormal.zig
index f8611ef805..f8611ef805 100644
--- a/std/math/isnormal.zig
+++ b/lib/std/math/isnormal.zig
diff --git a/std/math/ln.zig b/lib/std/math/ln.zig
index c5d4c9ff25..c5d4c9ff25 100644
--- a/std/math/ln.zig
+++ b/lib/std/math/ln.zig
diff --git a/std/math/log.zig b/lib/std/math/log.zig
index 77f3639fd2..77f3639fd2 100644
--- a/std/math/log.zig
+++ b/lib/std/math/log.zig
diff --git a/std/math/log10.zig b/lib/std/math/log10.zig
index 9b0bc3ac52..9b0bc3ac52 100644
--- a/std/math/log10.zig
+++ b/lib/std/math/log10.zig
diff --git a/std/math/log1p.zig b/lib/std/math/log1p.zig
index bae6deb536..bae6deb536 100644
--- a/std/math/log1p.zig
+++ b/lib/std/math/log1p.zig
diff --git a/std/math/log2.zig b/lib/std/math/log2.zig
index 88450a7ffd..88450a7ffd 100644
--- a/std/math/log2.zig
+++ b/lib/std/math/log2.zig
diff --git a/std/math/modf.zig b/lib/std/math/modf.zig
index 92194d4c75..92194d4c75 100644
--- a/std/math/modf.zig
+++ b/lib/std/math/modf.zig
diff --git a/std/math/nan.zig b/lib/std/math/nan.zig
index 5a01a5b3bd..5a01a5b3bd 100644
--- a/std/math/nan.zig
+++ b/lib/std/math/nan.zig
diff --git a/std/math/pow.zig b/lib/std/math/pow.zig
index c3a7792137..c3a7792137 100644
--- a/std/math/pow.zig
+++ b/lib/std/math/pow.zig
diff --git a/std/math/powi.zig b/lib/std/math/powi.zig
index d80700e5cd..d80700e5cd 100644
--- a/std/math/powi.zig
+++ b/lib/std/math/powi.zig
diff --git a/std/math/round.zig b/lib/std/math/round.zig
index 0b80a46ce5..0b80a46ce5 100644
--- a/std/math/round.zig
+++ b/lib/std/math/round.zig
diff --git a/std/math/scalbn.zig b/lib/std/math/scalbn.zig
index d5716d621c..d5716d621c 100644
--- a/std/math/scalbn.zig
+++ b/lib/std/math/scalbn.zig
diff --git a/std/math/signbit.zig b/lib/std/math/signbit.zig
index e5c5909292..e5c5909292 100644
--- a/std/math/signbit.zig
+++ b/lib/std/math/signbit.zig
diff --git a/std/math/sin.zig b/lib/std/math/sin.zig
index ee07b4f85e..ee07b4f85e 100644
--- a/std/math/sin.zig
+++ b/lib/std/math/sin.zig
diff --git a/std/math/sinh.zig b/lib/std/math/sinh.zig
index 73ee65ea6f..73ee65ea6f 100644
--- a/std/math/sinh.zig
+++ b/lib/std/math/sinh.zig
diff --git a/std/math/sqrt.zig b/lib/std/math/sqrt.zig
index 30af5915d4..30af5915d4 100644
--- a/std/math/sqrt.zig
+++ b/lib/std/math/sqrt.zig
diff --git a/std/math/tan.zig b/lib/std/math/tan.zig
index 049c85df12..049c85df12 100644
--- a/std/math/tan.zig
+++ b/lib/std/math/tan.zig
diff --git a/std/math/tanh.zig b/lib/std/math/tanh.zig
index 48d26d091e..48d26d091e 100644
--- a/std/math/tanh.zig
+++ b/lib/std/math/tanh.zig
diff --git a/std/math/trunc.zig b/lib/std/math/trunc.zig
index 219bcd4914..219bcd4914 100644
--- a/std/math/trunc.zig
+++ b/lib/std/math/trunc.zig
diff --git a/std/mem.zig b/lib/std/mem.zig
index 2091eb4804..2091eb4804 100644
--- a/std/mem.zig
+++ b/lib/std/mem.zig
diff --git a/std/meta.zig b/lib/std/meta.zig
index 52d8b54ecc..52d8b54ecc 100644
--- a/std/meta.zig
+++ b/lib/std/meta.zig
diff --git a/std/meta/trait.zig b/lib/std/meta/trait.zig
index 43be7f3dfb..43be7f3dfb 100644
--- a/std/meta/trait.zig
+++ b/lib/std/meta/trait.zig
diff --git a/std/mutex.zig b/lib/std/mutex.zig
index 5f3b9272d9..5f3b9272d9 100644
--- a/std/mutex.zig
+++ b/lib/std/mutex.zig
diff --git a/std/net.zig b/lib/std/net.zig
index be9d18056c..be9d18056c 100644
--- a/std/net.zig
+++ b/lib/std/net.zig
diff --git a/std/os.zig b/lib/std/os.zig
index ed626e0dcc..ed626e0dcc 100644
--- a/std/os.zig
+++ b/lib/std/os.zig
diff --git a/std/os/bits.zig b/lib/std/os/bits.zig
index f16da2487b..f16da2487b 100644
--- a/std/os/bits.zig
+++ b/lib/std/os/bits.zig
diff --git a/std/os/bits/darwin.zig b/lib/std/os/bits/darwin.zig
index b076f95884..b076f95884 100644
--- a/std/os/bits/darwin.zig
+++ b/lib/std/os/bits/darwin.zig
diff --git a/std/os/bits/freebsd.zig b/lib/std/os/bits/freebsd.zig
index 3d07e92e01..3d07e92e01 100644
--- a/std/os/bits/freebsd.zig
+++ b/lib/std/os/bits/freebsd.zig
diff --git a/std/os/bits/linux.zig b/lib/std/os/bits/linux.zig
index 939d203e8d..939d203e8d 100644
--- a/std/os/bits/linux.zig
+++ b/lib/std/os/bits/linux.zig
diff --git a/std/os/bits/linux/arm-eabi.zig b/lib/std/os/bits/linux/arm-eabi.zig
index 4b3e1094da..4b3e1094da 100644
--- a/std/os/bits/linux/arm-eabi.zig
+++ b/lib/std/os/bits/linux/arm-eabi.zig
diff --git a/std/os/bits/linux/arm64.zig b/lib/std/os/bits/linux/arm64.zig
index 692efc0eb3..692efc0eb3 100644
--- a/std/os/bits/linux/arm64.zig
+++ b/lib/std/os/bits/linux/arm64.zig
diff --git a/std/os/bits/linux/errno.zig b/lib/std/os/bits/linux/errno.zig
index 741f76fdee..741f76fdee 100644
--- a/std/os/bits/linux/errno.zig
+++ b/lib/std/os/bits/linux/errno.zig
diff --git a/std/os/bits/linux/riscv64.zig b/lib/std/os/bits/linux/riscv64.zig
index e0c10ef7c0..e0c10ef7c0 100644
--- a/std/os/bits/linux/riscv64.zig
+++ b/lib/std/os/bits/linux/riscv64.zig
diff --git a/std/os/bits/linux/x86_64.zig b/lib/std/os/bits/linux/x86_64.zig
index 626acd00d6..626acd00d6 100644
--- a/std/os/bits/linux/x86_64.zig
+++ b/lib/std/os/bits/linux/x86_64.zig
diff --git a/std/os/bits/netbsd.zig b/lib/std/os/bits/netbsd.zig
index 14c35faf6c..14c35faf6c 100644
--- a/std/os/bits/netbsd.zig
+++ b/lib/std/os/bits/netbsd.zig
diff --git a/std/os/bits/wasi.zig b/lib/std/os/bits/wasi.zig
index 93d2a82fde..93d2a82fde 100644
--- a/std/os/bits/wasi.zig
+++ b/lib/std/os/bits/wasi.zig
diff --git a/std/os/bits/windows.zig b/lib/std/os/bits/windows.zig
index fc148d812f..fc148d812f 100644
--- a/std/os/bits/windows.zig
+++ b/lib/std/os/bits/windows.zig
diff --git a/std/os/darwin.zig b/lib/std/os/darwin.zig
index 0adf71affb..0adf71affb 100644
--- a/std/os/darwin.zig
+++ b/lib/std/os/darwin.zig
diff --git a/std/os/freebsd.zig b/lib/std/os/freebsd.zig
index ddbf98f2bc..ddbf98f2bc 100644
--- a/std/os/freebsd.zig
+++ b/lib/std/os/freebsd.zig
diff --git a/std/os/linux.zig b/lib/std/os/linux.zig
index 7dcd01572e..7dcd01572e 100644
--- a/std/os/linux.zig
+++ b/lib/std/os/linux.zig
diff --git a/std/os/linux/arm-eabi.zig b/lib/std/os/linux/arm-eabi.zig
index a15234d742..a15234d742 100644
--- a/std/os/linux/arm-eabi.zig
+++ b/lib/std/os/linux/arm-eabi.zig
diff --git a/std/os/linux/arm64.zig b/lib/std/os/linux/arm64.zig
index 28da9af1c6..28da9af1c6 100644
--- a/std/os/linux/arm64.zig
+++ b/lib/std/os/linux/arm64.zig
diff --git a/std/os/linux/riscv64.zig b/lib/std/os/linux/riscv64.zig
index 7bfe0295d3..7bfe0295d3 100644
--- a/std/os/linux/riscv64.zig
+++ b/lib/std/os/linux/riscv64.zig
diff --git a/std/os/linux/test.zig b/lib/std/os/linux/test.zig
index 97bbcc402d..97bbcc402d 100644
--- a/std/os/linux/test.zig
+++ b/lib/std/os/linux/test.zig
diff --git a/std/os/linux/tls.zig b/lib/std/os/linux/tls.zig
index 167839570e..167839570e 100644
--- a/std/os/linux/tls.zig
+++ b/lib/std/os/linux/tls.zig
diff --git a/std/os/linux/vdso.zig b/lib/std/os/linux/vdso.zig
index 86d54bfbf8..86d54bfbf8 100644
--- a/std/os/linux/vdso.zig
+++ b/lib/std/os/linux/vdso.zig
diff --git a/std/os/linux/x86_64.zig b/lib/std/os/linux/x86_64.zig
index 0f3a36636a..0f3a36636a 100644
--- a/std/os/linux/x86_64.zig
+++ b/lib/std/os/linux/x86_64.zig
diff --git a/std/os/netbsd.zig b/lib/std/os/netbsd.zig
index d484e7374b..d484e7374b 100644
--- a/std/os/netbsd.zig
+++ b/lib/std/os/netbsd.zig
diff --git a/std/os/test.zig b/lib/std/os/test.zig
index 87d57b36c0..87d57b36c0 100644
--- a/std/os/test.zig
+++ b/lib/std/os/test.zig
diff --git a/std/os/uefi.zig b/lib/std/os/uefi.zig
index db46d50c1f..db46d50c1f 100644
--- a/std/os/uefi.zig
+++ b/lib/std/os/uefi.zig
diff --git a/std/os/uefi/protocols.zig b/lib/std/os/uefi/protocols.zig
index 2c8d870af0..2c8d870af0 100644
--- a/std/os/uefi/protocols.zig
+++ b/lib/std/os/uefi/protocols.zig
diff --git a/std/os/uefi/protocols/absolute_pointer_protocol.zig b/lib/std/os/uefi/protocols/absolute_pointer_protocol.zig
index df5a930319..df5a930319 100644
--- a/std/os/uefi/protocols/absolute_pointer_protocol.zig
+++ b/lib/std/os/uefi/protocols/absolute_pointer_protocol.zig
diff --git a/std/os/uefi/protocols/edid_active_protocol.zig b/lib/std/os/uefi/protocols/edid_active_protocol.zig
index 1a96cb6cd5..1a96cb6cd5 100644
--- a/std/os/uefi/protocols/edid_active_protocol.zig
+++ b/lib/std/os/uefi/protocols/edid_active_protocol.zig
diff --git a/std/os/uefi/protocols/edid_discovered_protocol.zig b/lib/std/os/uefi/protocols/edid_discovered_protocol.zig
index f68b0fa3d6..f68b0fa3d6 100644
--- a/std/os/uefi/protocols/edid_discovered_protocol.zig
+++ b/lib/std/os/uefi/protocols/edid_discovered_protocol.zig
diff --git a/std/os/uefi/protocols/edid_override_protocol.zig b/lib/std/os/uefi/protocols/edid_override_protocol.zig
index ad2eec1207..ad2eec1207 100644
--- a/std/os/uefi/protocols/edid_override_protocol.zig
+++ b/lib/std/os/uefi/protocols/edid_override_protocol.zig
diff --git a/std/os/uefi/protocols/graphics_output_protocol.zig b/lib/std/os/uefi/protocols/graphics_output_protocol.zig
index 4713df0501..4713df0501 100644
--- a/std/os/uefi/protocols/graphics_output_protocol.zig
+++ b/lib/std/os/uefi/protocols/graphics_output_protocol.zig
diff --git a/std/os/uefi/protocols/rng_protocol.zig b/lib/std/os/uefi/protocols/rng_protocol.zig
index 565832caf9..565832caf9 100644
--- a/std/os/uefi/protocols/rng_protocol.zig
+++ b/lib/std/os/uefi/protocols/rng_protocol.zig
diff --git a/std/os/uefi/protocols/simple_pointer_protocol.zig b/lib/std/os/uefi/protocols/simple_pointer_protocol.zig
index 369bc76aaa..369bc76aaa 100644
--- a/std/os/uefi/protocols/simple_pointer_protocol.zig
+++ b/lib/std/os/uefi/protocols/simple_pointer_protocol.zig
diff --git a/std/os/uefi/protocols/simple_text_input_ex_protocol.zig b/lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
index 5507b8950c..5507b8950c 100644
--- a/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
+++ b/lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
diff --git a/std/os/uefi/protocols/simple_text_output_protocol.zig b/lib/std/os/uefi/protocols/simple_text_output_protocol.zig
index e6b2e21c70..e6b2e21c70 100644
--- a/std/os/uefi/protocols/simple_text_output_protocol.zig
+++ b/lib/std/os/uefi/protocols/simple_text_output_protocol.zig
diff --git a/std/os/uefi/status.zig b/lib/std/os/uefi/status.zig
index 6deb741d0d..6deb741d0d 100644
--- a/std/os/uefi/status.zig
+++ b/lib/std/os/uefi/status.zig
diff --git a/std/os/uefi/tables.zig b/lib/std/os/uefi/tables.zig
index fbb9abe7f6..fbb9abe7f6 100644
--- a/std/os/uefi/tables.zig
+++ b/lib/std/os/uefi/tables.zig
diff --git a/std/os/uefi/tables/boot_services.zig b/lib/std/os/uefi/tables/boot_services.zig
index 55b0de3478..55b0de3478 100644
--- a/std/os/uefi/tables/boot_services.zig
+++ b/lib/std/os/uefi/tables/boot_services.zig
diff --git a/std/os/uefi/tables/configuration_table.zig b/lib/std/os/uefi/tables/configuration_table.zig
index eb99e08477..eb99e08477 100644
--- a/std/os/uefi/tables/configuration_table.zig
+++ b/lib/std/os/uefi/tables/configuration_table.zig
diff --git a/std/os/uefi/tables/runtime_services.zig b/lib/std/os/uefi/tables/runtime_services.zig
index 53cb17db50..53cb17db50 100644
--- a/std/os/uefi/tables/runtime_services.zig
+++ b/lib/std/os/uefi/tables/runtime_services.zig
diff --git a/std/os/uefi/tables/system_table.zig b/lib/std/os/uefi/tables/system_table.zig
index 23140f984e..23140f984e 100644
--- a/std/os/uefi/tables/system_table.zig
+++ b/lib/std/os/uefi/tables/system_table.zig
diff --git a/std/os/uefi/tables/table_header.zig b/lib/std/os/uefi/tables/table_header.zig
index b955768e63..b955768e63 100644
--- a/std/os/uefi/tables/table_header.zig
+++ b/lib/std/os/uefi/tables/table_header.zig
diff --git a/std/os/wasi.zig b/lib/std/os/wasi.zig
index 57b708395c..57b708395c 100644
--- a/std/os/wasi.zig
+++ b/lib/std/os/wasi.zig
diff --git a/std/os/windows.zig b/lib/std/os/windows.zig
index 7c1761a4b8..7c1761a4b8 100644
--- a/std/os/windows.zig
+++ b/lib/std/os/windows.zig
diff --git a/std/os/windows/advapi32.zig b/lib/std/os/windows/advapi32.zig
index 940f10994c..940f10994c 100644
--- a/std/os/windows/advapi32.zig
+++ b/lib/std/os/windows/advapi32.zig
diff --git a/std/os/windows/bits.zig b/lib/std/os/windows/bits.zig
index ddfdd27e1b..ddfdd27e1b 100644
--- a/std/os/windows/bits.zig
+++ b/lib/std/os/windows/bits.zig
diff --git a/std/os/windows/error.zig b/lib/std/os/windows/error.zig
index f90945d00e..f90945d00e 100644
--- a/std/os/windows/error.zig
+++ b/lib/std/os/windows/error.zig
diff --git a/std/os/windows/kernel32.zig b/lib/std/os/windows/kernel32.zig
index 2ae73ad45a..2ae73ad45a 100644
--- a/std/os/windows/kernel32.zig
+++ b/lib/std/os/windows/kernel32.zig
diff --git a/std/os/windows/lang.zig b/lib/std/os/windows/lang.zig
index b173a62a73..b173a62a73 100644
--- a/std/os/windows/lang.zig
+++ b/lib/std/os/windows/lang.zig
diff --git a/std/os/windows/ntdll.zig b/lib/std/os/windows/ntdll.zig
index bfc98aba8a..bfc98aba8a 100644
--- a/std/os/windows/ntdll.zig
+++ b/lib/std/os/windows/ntdll.zig
diff --git a/std/os/windows/ole32.zig b/lib/std/os/windows/ole32.zig
index 39c12d074c..39c12d074c 100644
--- a/std/os/windows/ole32.zig
+++ b/lib/std/os/windows/ole32.zig
diff --git a/std/os/windows/shell32.zig b/lib/std/os/windows/shell32.zig
index c178997aad..c178997aad 100644
--- a/std/os/windows/shell32.zig
+++ b/lib/std/os/windows/shell32.zig
diff --git a/std/os/windows/status.zig b/lib/std/os/windows/status.zig
index b9fd2b495f..b9fd2b495f 100644
--- a/std/os/windows/status.zig
+++ b/lib/std/os/windows/status.zig
diff --git a/std/os/windows/sublang.zig b/lib/std/os/windows/sublang.zig
index e9929c6d79..e9929c6d79 100644
--- a/std/os/windows/sublang.zig
+++ b/lib/std/os/windows/sublang.zig
diff --git a/std/os/zen.zig b/lib/std/os/zen.zig
index 727f55fa6d..727f55fa6d 100644
--- a/std/os/zen.zig
+++ b/lib/std/os/zen.zig
diff --git a/std/packed_int_array.zig b/lib/std/packed_int_array.zig
index 5cbab2d33b..5cbab2d33b 100644
--- a/std/packed_int_array.zig
+++ b/lib/std/packed_int_array.zig
diff --git a/std/pdb.zig b/lib/std/pdb.zig
index 7a2b2c6b6b..7a2b2c6b6b 100644
--- a/std/pdb.zig
+++ b/lib/std/pdb.zig
diff --git a/std/priority_queue.zig b/lib/std/priority_queue.zig
index e6f398a551..e6f398a551 100644
--- a/std/priority_queue.zig
+++ b/lib/std/priority_queue.zig
diff --git a/std/process.zig b/lib/std/process.zig
index c74e8c43be..c74e8c43be 100644
--- a/std/process.zig
+++ b/lib/std/process.zig
diff --git a/std/rand.zig b/lib/std/rand.zig
index e14a60e2ae..e14a60e2ae 100644
--- a/std/rand.zig
+++ b/lib/std/rand.zig
diff --git a/std/rand/ziggurat.zig b/lib/std/rand/ziggurat.zig
index 995248415b..995248415b 100644
--- a/std/rand/ziggurat.zig
+++ b/lib/std/rand/ziggurat.zig
diff --git a/std/rb.zig b/lib/std/rb.zig
index 4180c7459c..4180c7459c 100644
--- a/std/rb.zig
+++ b/lib/std/rb.zig
diff --git a/std/segmented_list.zig b/lib/std/segmented_list.zig
index 3bbbde782e..3bbbde782e 100644
--- a/std/segmented_list.zig
+++ b/lib/std/segmented_list.zig
diff --git a/std/sort.zig b/lib/std/sort.zig
index 378a92992f..378a92992f 100644
--- a/std/sort.zig
+++ b/lib/std/sort.zig
diff --git a/std/special/build_runner.zig b/lib/std/special/build_runner.zig
index 01e307d46e..efe3275fe6 100644
--- a/std/special/build_runner.zig
+++ b/lib/std/special/build_runner.zig
@@ -90,11 +90,6 @@ pub fn main() !void {
                     return usageAndErr(builder, false, try stderr_stream);
                 });
                 builder.addSearchPrefix(search_prefix);
-            } else if (mem.eql(u8, arg, "--override-std-dir")) {
-                builder.override_std_dir = try unwrapArg(arg_it.next(allocator) orelse {
-                    warn("Expected argument after --override-std-dir\n\n");
-                    return usageAndErr(builder, false, try stderr_stream);
-                });
             } else if (mem.eql(u8, arg, "--override-lib-dir")) {
                 builder.override_lib_dir = try unwrapArg(arg_it.next(allocator) orelse {
                     warn("Expected argument after --override-lib-dir\n\n");
@@ -199,7 +194,6 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void {
         \\Advanced Options:
         \\  --build-file [file]      Override path to build.zig
         \\  --cache-dir [path]       Override path to zig cache directory
-        \\  --override-std-dir [arg] Override path to Zig standard library
         \\  --override-lib-dir [arg] Override path to Zig lib directory
         \\  --verbose-tokenize       Enable compiler debug output for tokenization
         \\  --verbose-ast            Enable compiler debug output for parsing into an AST
diff --git a/std/special/c.zig b/lib/std/special/c.zig
index f030dbe90b..f030dbe90b 100644
--- a/std/special/c.zig
+++ b/lib/std/special/c.zig
diff --git a/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig
index 638a9bb60c..638a9bb60c 100644
--- a/std/special/compiler_rt.zig
+++ b/lib/std/special/compiler_rt.zig
diff --git a/std/special/compiler_rt/README.md b/lib/std/special/compiler_rt/README.md
index bc853f2958..bc853f2958 100644
--- a/std/special/compiler_rt/README.md
+++ b/lib/std/special/compiler_rt/README.md
diff --git a/std/special/compiler_rt/addXf3.zig b/lib/std/special/compiler_rt/addXf3.zig
index 1654c1f08b..1654c1f08b 100644
--- a/std/special/compiler_rt/addXf3.zig
+++ b/lib/std/special/compiler_rt/addXf3.zig
diff --git a/std/special/compiler_rt/addXf3_test.zig b/lib/std/special/compiler_rt/addXf3_test.zig
index 099b737976..099b737976 100644
--- a/std/special/compiler_rt/addXf3_test.zig
+++ b/lib/std/special/compiler_rt/addXf3_test.zig
diff --git a/std/special/compiler_rt/arm/aeabi_dcmp.zig b/lib/std/special/compiler_rt/arm/aeabi_dcmp.zig
index 33bfdabcfb..33bfdabcfb 100644
--- a/std/special/compiler_rt/arm/aeabi_dcmp.zig
+++ b/lib/std/special/compiler_rt/arm/aeabi_dcmp.zig
diff --git a/std/special/compiler_rt/arm/aeabi_fcmp.zig b/lib/std/special/compiler_rt/arm/aeabi_fcmp.zig
index cc5efc64fc..cc5efc64fc 100644
--- a/std/special/compiler_rt/arm/aeabi_fcmp.zig
+++ b/lib/std/special/compiler_rt/arm/aeabi_fcmp.zig
diff --git a/std/special/compiler_rt/ashlti3.zig b/lib/std/special/compiler_rt/ashlti3.zig
index 65b23f22e5..65b23f22e5 100644
--- a/std/special/compiler_rt/ashlti3.zig
+++ b/lib/std/special/compiler_rt/ashlti3.zig
diff --git a/std/special/compiler_rt/ashlti3_test.zig b/lib/std/special/compiler_rt/ashlti3_test.zig
index 4ba21c138e..4ba21c138e 100644
--- a/std/special/compiler_rt/ashlti3_test.zig
+++ b/lib/std/special/compiler_rt/ashlti3_test.zig
diff --git a/std/special/compiler_rt/ashrti3.zig b/lib/std/special/compiler_rt/ashrti3.zig
index 40ee89c3c4..40ee89c3c4 100644
--- a/std/special/compiler_rt/ashrti3.zig
+++ b/lib/std/special/compiler_rt/ashrti3.zig
diff --git a/std/special/compiler_rt/ashrti3_test.zig b/lib/std/special/compiler_rt/ashrti3_test.zig
index ad3164be8d..ad3164be8d 100644
--- a/std/special/compiler_rt/ashrti3_test.zig
+++ b/lib/std/special/compiler_rt/ashrti3_test.zig
diff --git a/std/special/compiler_rt/aulldiv.zig b/lib/std/special/compiler_rt/aulldiv.zig
index d99bc94ff5..d99bc94ff5 100644
--- a/std/special/compiler_rt/aulldiv.zig
+++ b/lib/std/special/compiler_rt/aulldiv.zig
diff --git a/std/special/compiler_rt/aullrem.zig b/lib/std/special/compiler_rt/aullrem.zig
index 51c4eebe3e..51c4eebe3e 100644
--- a/std/special/compiler_rt/aullrem.zig
+++ b/lib/std/special/compiler_rt/aullrem.zig
diff --git a/std/special/compiler_rt/comparedf2.zig b/lib/std/special/compiler_rt/comparedf2.zig
index f97e2474be..f97e2474be 100644
--- a/std/special/compiler_rt/comparedf2.zig
+++ b/lib/std/special/compiler_rt/comparedf2.zig
diff --git a/std/special/compiler_rt/comparedf2_test.zig b/lib/std/special/compiler_rt/comparedf2_test.zig
index b0e5757ec0..b0e5757ec0 100644
--- a/std/special/compiler_rt/comparedf2_test.zig
+++ b/lib/std/special/compiler_rt/comparedf2_test.zig
diff --git a/std/special/compiler_rt/comparesf2.zig b/lib/std/special/compiler_rt/comparesf2.zig
index e99e0bb3dd..e99e0bb3dd 100644
--- a/std/special/compiler_rt/comparesf2.zig
+++ b/lib/std/special/compiler_rt/comparesf2.zig
diff --git a/std/special/compiler_rt/comparesf2_test.zig b/lib/std/special/compiler_rt/comparesf2_test.zig
index d736988bfb..d736988bfb 100644
--- a/std/special/compiler_rt/comparesf2_test.zig
+++ b/lib/std/special/compiler_rt/comparesf2_test.zig
diff --git a/std/special/compiler_rt/comparetf2.zig b/lib/std/special/compiler_rt/comparetf2.zig
index 05e5974558..05e5974558 100644
--- a/std/special/compiler_rt/comparetf2.zig
+++ b/lib/std/special/compiler_rt/comparetf2.zig
diff --git a/std/special/compiler_rt/divdf3.zig b/lib/std/special/compiler_rt/divdf3.zig
index 072feaec67..072feaec67 100644
--- a/std/special/compiler_rt/divdf3.zig
+++ b/lib/std/special/compiler_rt/divdf3.zig
diff --git a/std/special/compiler_rt/divdf3_test.zig b/lib/std/special/compiler_rt/divdf3_test.zig
index 61d6731ea7..61d6731ea7 100644
--- a/std/special/compiler_rt/divdf3_test.zig
+++ b/lib/std/special/compiler_rt/divdf3_test.zig
diff --git a/std/special/compiler_rt/divsf3.zig b/lib/std/special/compiler_rt/divsf3.zig
index 447653fbe1..447653fbe1 100644
--- a/std/special/compiler_rt/divsf3.zig
+++ b/lib/std/special/compiler_rt/divsf3.zig
diff --git a/std/special/compiler_rt/divsf3_test.zig b/lib/std/special/compiler_rt/divsf3_test.zig
index 188842af58..188842af58 100644
--- a/std/special/compiler_rt/divsf3_test.zig
+++ b/lib/std/special/compiler_rt/divsf3_test.zig
diff --git a/std/special/compiler_rt/divti3.zig b/lib/std/special/compiler_rt/divti3.zig
index 477ce2cb98..477ce2cb98 100644
--- a/std/special/compiler_rt/divti3.zig
+++ b/lib/std/special/compiler_rt/divti3.zig
diff --git a/std/special/compiler_rt/divti3_test.zig b/lib/std/special/compiler_rt/divti3_test.zig
index e1c1babae7..e1c1babae7 100644
--- a/std/special/compiler_rt/divti3_test.zig
+++ b/lib/std/special/compiler_rt/divti3_test.zig
diff --git a/std/special/compiler_rt/extendXfYf2.zig b/lib/std/special/compiler_rt/extendXfYf2.zig
index e10667843f..e10667843f 100644
--- a/std/special/compiler_rt/extendXfYf2.zig
+++ b/lib/std/special/compiler_rt/extendXfYf2.zig
diff --git a/std/special/compiler_rt/extendXfYf2_test.zig b/lib/std/special/compiler_rt/extendXfYf2_test.zig
index 050a799823..050a799823 100644
--- a/std/special/compiler_rt/extendXfYf2_test.zig
+++ b/lib/std/special/compiler_rt/extendXfYf2_test.zig
diff --git a/std/special/compiler_rt/fixdfdi.zig b/lib/std/special/compiler_rt/fixdfdi.zig
index c108fd15aa..c108fd15aa 100644
--- a/std/special/compiler_rt/fixdfdi.zig
+++ b/lib/std/special/compiler_rt/fixdfdi.zig
diff --git a/std/special/compiler_rt/fixdfdi_test.zig b/lib/std/special/compiler_rt/fixdfdi_test.zig
index 1ba8a4f87d..1ba8a4f87d 100644
--- a/std/special/compiler_rt/fixdfdi_test.zig
+++ b/lib/std/special/compiler_rt/fixdfdi_test.zig
diff --git a/std/special/compiler_rt/fixdfsi.zig b/lib/std/special/compiler_rt/fixdfsi.zig
index 83a17b2b0d..83a17b2b0d 100644
--- a/std/special/compiler_rt/fixdfsi.zig
+++ b/lib/std/special/compiler_rt/fixdfsi.zig
diff --git a/std/special/compiler_rt/fixdfsi_test.zig b/lib/std/special/compiler_rt/fixdfsi_test.zig
index fa5ff72e8f..fa5ff72e8f 100644
--- a/std/special/compiler_rt/fixdfsi_test.zig
+++ b/lib/std/special/compiler_rt/fixdfsi_test.zig
diff --git a/std/special/compiler_rt/fixdfti.zig b/lib/std/special/compiler_rt/fixdfti.zig
index e30f885cf6..e30f885cf6 100644
--- a/std/special/compiler_rt/fixdfti.zig
+++ b/lib/std/special/compiler_rt/fixdfti.zig
diff --git a/std/special/compiler_rt/fixdfti_test.zig b/lib/std/special/compiler_rt/fixdfti_test.zig
index 4ab2c04cd1..4ab2c04cd1 100644
--- a/std/special/compiler_rt/fixdfti_test.zig
+++ b/lib/std/special/compiler_rt/fixdfti_test.zig
diff --git a/std/special/compiler_rt/fixint.zig b/lib/std/special/compiler_rt/fixint.zig
index fd31798cc2..fd31798cc2 100644
--- a/std/special/compiler_rt/fixint.zig
+++ b/lib/std/special/compiler_rt/fixint.zig
diff --git a/std/special/compiler_rt/fixint_test.zig b/lib/std/special/compiler_rt/fixint_test.zig
index a876e17263..a876e17263 100644
--- a/std/special/compiler_rt/fixint_test.zig
+++ b/lib/std/special/compiler_rt/fixint_test.zig
diff --git a/std/special/compiler_rt/fixsfdi.zig b/lib/std/special/compiler_rt/fixsfdi.zig
index ffa81d13ab..ffa81d13ab 100644
--- a/std/special/compiler_rt/fixsfdi.zig
+++ b/lib/std/special/compiler_rt/fixsfdi.zig
diff --git a/std/special/compiler_rt/fixsfdi_test.zig b/lib/std/special/compiler_rt/fixsfdi_test.zig
index bfd715425c..bfd715425c 100644
--- a/std/special/compiler_rt/fixsfdi_test.zig
+++ b/lib/std/special/compiler_rt/fixsfdi_test.zig
diff --git a/std/special/compiler_rt/fixsfsi.zig b/lib/std/special/compiler_rt/fixsfsi.zig
index 9a94b4395b..9a94b4395b 100644
--- a/std/special/compiler_rt/fixsfsi.zig
+++ b/lib/std/special/compiler_rt/fixsfsi.zig
diff --git a/std/special/compiler_rt/fixsfsi_test.zig b/lib/std/special/compiler_rt/fixsfsi_test.zig
index 30406fea22..30406fea22 100644
--- a/std/special/compiler_rt/fixsfsi_test.zig
+++ b/lib/std/special/compiler_rt/fixsfsi_test.zig
diff --git a/std/special/compiler_rt/fixsfti.zig b/lib/std/special/compiler_rt/fixsfti.zig
index 806a1678aa..806a1678aa 100644
--- a/std/special/compiler_rt/fixsfti.zig
+++ b/lib/std/special/compiler_rt/fixsfti.zig
diff --git a/std/special/compiler_rt/fixsfti_test.zig b/lib/std/special/compiler_rt/fixsfti_test.zig
index 7136f7cfe8..7136f7cfe8 100644
--- a/std/special/compiler_rt/fixsfti_test.zig
+++ b/lib/std/special/compiler_rt/fixsfti_test.zig
diff --git a/std/special/compiler_rt/fixtfdi.zig b/lib/std/special/compiler_rt/fixtfdi.zig
index 8d99231b74..8d99231b74 100644
--- a/std/special/compiler_rt/fixtfdi.zig
+++ b/lib/std/special/compiler_rt/fixtfdi.zig
diff --git a/std/special/compiler_rt/fixtfdi_test.zig b/lib/std/special/compiler_rt/fixtfdi_test.zig
index 7c63547642..7c63547642 100644
--- a/std/special/compiler_rt/fixtfdi_test.zig
+++ b/lib/std/special/compiler_rt/fixtfdi_test.zig
diff --git a/std/special/compiler_rt/fixtfsi.zig b/lib/std/special/compiler_rt/fixtfsi.zig
index f3f83634b2..f3f83634b2 100644
--- a/std/special/compiler_rt/fixtfsi.zig
+++ b/lib/std/special/compiler_rt/fixtfsi.zig
diff --git a/std/special/compiler_rt/fixtfsi_test.zig b/lib/std/special/compiler_rt/fixtfsi_test.zig
index da769089df..da769089df 100644
--- a/std/special/compiler_rt/fixtfsi_test.zig
+++ b/lib/std/special/compiler_rt/fixtfsi_test.zig
diff --git a/std/special/compiler_rt/fixtfti.zig b/lib/std/special/compiler_rt/fixtfti.zig
index 07d38f2c3b..07d38f2c3b 100644
--- a/std/special/compiler_rt/fixtfti.zig
+++ b/lib/std/special/compiler_rt/fixtfti.zig
diff --git a/std/special/compiler_rt/fixtfti_test.zig b/lib/std/special/compiler_rt/fixtfti_test.zig
index 02dba7fd61..02dba7fd61 100644
--- a/std/special/compiler_rt/fixtfti_test.zig
+++ b/lib/std/special/compiler_rt/fixtfti_test.zig
diff --git a/std/special/compiler_rt/fixuint.zig b/lib/std/special/compiler_rt/fixuint.zig
index 55a113b368..55a113b368 100644
--- a/std/special/compiler_rt/fixuint.zig
+++ b/lib/std/special/compiler_rt/fixuint.zig
diff --git a/std/special/compiler_rt/fixunsdfdi.zig b/lib/std/special/compiler_rt/fixunsdfdi.zig
index 1fa7ed758e..1fa7ed758e 100644
--- a/std/special/compiler_rt/fixunsdfdi.zig
+++ b/lib/std/special/compiler_rt/fixunsdfdi.zig
diff --git a/std/special/compiler_rt/fixunsdfdi_test.zig b/lib/std/special/compiler_rt/fixunsdfdi_test.zig
index 67eeb70520..67eeb70520 100644
--- a/std/special/compiler_rt/fixunsdfdi_test.zig
+++ b/lib/std/special/compiler_rt/fixunsdfdi_test.zig
diff --git a/std/special/compiler_rt/fixunsdfsi.zig b/lib/std/special/compiler_rt/fixunsdfsi.zig
index a77cb8df89..a77cb8df89 100644
--- a/std/special/compiler_rt/fixunsdfsi.zig
+++ b/lib/std/special/compiler_rt/fixunsdfsi.zig
diff --git a/std/special/compiler_rt/fixunsdfsi_test.zig b/lib/std/special/compiler_rt/fixunsdfsi_test.zig
index c006473fb9..c006473fb9 100644
--- a/std/special/compiler_rt/fixunsdfsi_test.zig
+++ b/lib/std/special/compiler_rt/fixunsdfsi_test.zig
diff --git a/std/special/compiler_rt/fixunsdfti.zig b/lib/std/special/compiler_rt/fixunsdfti.zig
index 6e1ded46e5..6e1ded46e5 100644
--- a/std/special/compiler_rt/fixunsdfti.zig
+++ b/lib/std/special/compiler_rt/fixunsdfti.zig
diff --git a/std/special/compiler_rt/fixunsdfti_test.zig b/lib/std/special/compiler_rt/fixunsdfti_test.zig
index 8241900692..8241900692 100644
--- a/std/special/compiler_rt/fixunsdfti_test.zig
+++ b/lib/std/special/compiler_rt/fixunsdfti_test.zig
diff --git a/std/special/compiler_rt/fixunssfdi.zig b/lib/std/special/compiler_rt/fixunssfdi.zig
index 36d4acc28c..36d4acc28c 100644
--- a/std/special/compiler_rt/fixunssfdi.zig
+++ b/lib/std/special/compiler_rt/fixunssfdi.zig
diff --git a/std/special/compiler_rt/fixunssfdi_test.zig b/lib/std/special/compiler_rt/fixunssfdi_test.zig
index e2089822d2..e2089822d2 100644
--- a/std/special/compiler_rt/fixunssfdi_test.zig
+++ b/lib/std/special/compiler_rt/fixunssfdi_test.zig
diff --git a/std/special/compiler_rt/fixunssfsi.zig b/lib/std/special/compiler_rt/fixunssfsi.zig
index 53130286a1..53130286a1 100644
--- a/std/special/compiler_rt/fixunssfsi.zig
+++ b/lib/std/special/compiler_rt/fixunssfsi.zig
diff --git a/std/special/compiler_rt/fixunssfsi_test.zig b/lib/std/special/compiler_rt/fixunssfsi_test.zig
index 4aee84d2d2..4aee84d2d2 100644
--- a/std/special/compiler_rt/fixunssfsi_test.zig
+++ b/lib/std/special/compiler_rt/fixunssfsi_test.zig
diff --git a/std/special/compiler_rt/fixunssfti.zig b/lib/std/special/compiler_rt/fixunssfti.zig
index f0cd788d2e..f0cd788d2e 100644
--- a/std/special/compiler_rt/fixunssfti.zig
+++ b/lib/std/special/compiler_rt/fixunssfti.zig
diff --git a/std/special/compiler_rt/fixunssfti_test.zig b/lib/std/special/compiler_rt/fixunssfti_test.zig
index 4cb27cbb8a..4cb27cbb8a 100644
--- a/std/special/compiler_rt/fixunssfti_test.zig
+++ b/lib/std/special/compiler_rt/fixunssfti_test.zig
diff --git a/std/special/compiler_rt/fixunstfdi.zig b/lib/std/special/compiler_rt/fixunstfdi.zig
index e352044708..e352044708 100644
--- a/std/special/compiler_rt/fixunstfdi.zig
+++ b/lib/std/special/compiler_rt/fixunstfdi.zig
diff --git a/std/special/compiler_rt/fixunstfdi_test.zig b/lib/std/special/compiler_rt/fixunstfdi_test.zig
index 0d47641c09..0d47641c09 100644
--- a/std/special/compiler_rt/fixunstfdi_test.zig
+++ b/lib/std/special/compiler_rt/fixunstfdi_test.zig
diff --git a/std/special/compiler_rt/fixunstfsi.zig b/lib/std/special/compiler_rt/fixunstfsi.zig
index 579c559790..579c559790 100644
--- a/std/special/compiler_rt/fixunstfsi.zig
+++ b/lib/std/special/compiler_rt/fixunstfsi.zig
diff --git a/std/special/compiler_rt/fixunstfsi_test.zig b/lib/std/special/compiler_rt/fixunstfsi_test.zig
index e709636912..e709636912 100644
--- a/std/special/compiler_rt/fixunstfsi_test.zig
+++ b/lib/std/special/compiler_rt/fixunstfsi_test.zig
diff --git a/std/special/compiler_rt/fixunstfti.zig b/lib/std/special/compiler_rt/fixunstfti.zig
index cd6178164a..cd6178164a 100644
--- a/std/special/compiler_rt/fixunstfti.zig
+++ b/lib/std/special/compiler_rt/fixunstfti.zig
diff --git a/std/special/compiler_rt/fixunstfti_test.zig b/lib/std/special/compiler_rt/fixunstfti_test.zig
index 833e4779dd..833e4779dd 100644
--- a/std/special/compiler_rt/fixunstfti_test.zig
+++ b/lib/std/special/compiler_rt/fixunstfti_test.zig
diff --git a/std/special/compiler_rt/floatdidf.zig b/lib/std/special/compiler_rt/floatdidf.zig
index 1610136413..1610136413 100644
--- a/std/special/compiler_rt/floatdidf.zig
+++ b/lib/std/special/compiler_rt/floatdidf.zig
diff --git a/std/special/compiler_rt/floatdidf_test.zig b/lib/std/special/compiler_rt/floatdidf_test.zig
index c854183809..c854183809 100644
--- a/std/special/compiler_rt/floatdidf_test.zig
+++ b/lib/std/special/compiler_rt/floatdidf_test.zig
diff --git a/std/special/compiler_rt/floatsiXf.zig b/lib/std/special/compiler_rt/floatsiXf.zig
index 7e05a3ebf7..7e05a3ebf7 100644
--- a/std/special/compiler_rt/floatsiXf.zig
+++ b/lib/std/special/compiler_rt/floatsiXf.zig
diff --git a/std/special/compiler_rt/floattidf.zig b/lib/std/special/compiler_rt/floattidf.zig
index 42ef6df7e4..42ef6df7e4 100644
--- a/std/special/compiler_rt/floattidf.zig
+++ b/lib/std/special/compiler_rt/floattidf.zig
diff --git a/std/special/compiler_rt/floattidf_test.zig b/lib/std/special/compiler_rt/floattidf_test.zig
index 4914342c31..4914342c31 100644
--- a/std/special/compiler_rt/floattidf_test.zig
+++ b/lib/std/special/compiler_rt/floattidf_test.zig
diff --git a/std/special/compiler_rt/floattisf.zig b/lib/std/special/compiler_rt/floattisf.zig
index f397d130ef..f397d130ef 100644
--- a/std/special/compiler_rt/floattisf.zig
+++ b/lib/std/special/compiler_rt/floattisf.zig
diff --git a/std/special/compiler_rt/floattisf_test.zig b/lib/std/special/compiler_rt/floattisf_test.zig
index a6aa115307..a6aa115307 100644
--- a/std/special/compiler_rt/floattisf_test.zig
+++ b/lib/std/special/compiler_rt/floattisf_test.zig
diff --git a/std/special/compiler_rt/floattitf.zig b/lib/std/special/compiler_rt/floattitf.zig
index b05282e293..b05282e293 100644
--- a/std/special/compiler_rt/floattitf.zig
+++ b/lib/std/special/compiler_rt/floattitf.zig
diff --git a/std/special/compiler_rt/floattitf_test.zig b/lib/std/special/compiler_rt/floattitf_test.zig
index 53e3e48bdb..53e3e48bdb 100644
--- a/std/special/compiler_rt/floattitf_test.zig
+++ b/lib/std/special/compiler_rt/floattitf_test.zig
diff --git a/std/special/compiler_rt/floatundidf.zig b/lib/std/special/compiler_rt/floatundidf.zig
index 68759a2acd..68759a2acd 100644
--- a/std/special/compiler_rt/floatundidf.zig
+++ b/lib/std/special/compiler_rt/floatundidf.zig
diff --git a/std/special/compiler_rt/floatundidf_test.zig b/lib/std/special/compiler_rt/floatundidf_test.zig
index 084ada51c9..084ada51c9 100644
--- a/std/special/compiler_rt/floatundidf_test.zig
+++ b/lib/std/special/compiler_rt/floatundidf_test.zig
diff --git a/std/special/compiler_rt/floatunditf.zig b/lib/std/special/compiler_rt/floatunditf.zig
index 9af83a2b5d..9af83a2b5d 100644
--- a/std/special/compiler_rt/floatunditf.zig
+++ b/lib/std/special/compiler_rt/floatunditf.zig
diff --git a/std/special/compiler_rt/floatunditf_test.zig b/lib/std/special/compiler_rt/floatunditf_test.zig
index 5b4e195870..5b4e195870 100644
--- a/std/special/compiler_rt/floatunditf_test.zig
+++ b/lib/std/special/compiler_rt/floatunditf_test.zig
diff --git a/std/special/compiler_rt/floatunsidf.zig b/lib/std/special/compiler_rt/floatunsidf.zig
index efeb4c2672..efeb4c2672 100644
--- a/std/special/compiler_rt/floatunsidf.zig
+++ b/lib/std/special/compiler_rt/floatunsidf.zig
diff --git a/std/special/compiler_rt/floatunsitf.zig b/lib/std/special/compiler_rt/floatunsitf.zig
index 18397f8ad0..18397f8ad0 100644
--- a/std/special/compiler_rt/floatunsitf.zig
+++ b/lib/std/special/compiler_rt/floatunsitf.zig
diff --git a/std/special/compiler_rt/floatunsitf_test.zig b/lib/std/special/compiler_rt/floatunsitf_test.zig
index 52e4786903..52e4786903 100644
--- a/std/special/compiler_rt/floatunsitf_test.zig
+++ b/lib/std/special/compiler_rt/floatunsitf_test.zig
diff --git a/std/special/compiler_rt/floatuntidf.zig b/lib/std/special/compiler_rt/floatuntidf.zig
index 2cd38c7308..2cd38c7308 100644
--- a/std/special/compiler_rt/floatuntidf.zig
+++ b/lib/std/special/compiler_rt/floatuntidf.zig
diff --git a/std/special/compiler_rt/floatuntidf_test.zig b/lib/std/special/compiler_rt/floatuntidf_test.zig
index 974f3e4be3..974f3e4be3 100644
--- a/std/special/compiler_rt/floatuntidf_test.zig
+++ b/lib/std/special/compiler_rt/floatuntidf_test.zig
diff --git a/std/special/compiler_rt/floatuntisf.zig b/lib/std/special/compiler_rt/floatuntisf.zig
index 1b42b267d9..1b42b267d9 100644
--- a/std/special/compiler_rt/floatuntisf.zig
+++ b/lib/std/special/compiler_rt/floatuntisf.zig
diff --git a/std/special/compiler_rt/floatuntisf_test.zig b/lib/std/special/compiler_rt/floatuntisf_test.zig
index 3a97807066..3a97807066 100644
--- a/std/special/compiler_rt/floatuntisf_test.zig
+++ b/lib/std/special/compiler_rt/floatuntisf_test.zig
diff --git a/std/special/compiler_rt/floatuntitf.zig b/lib/std/special/compiler_rt/floatuntitf.zig
index eddcf92efd..eddcf92efd 100644
--- a/std/special/compiler_rt/floatuntitf.zig
+++ b/lib/std/special/compiler_rt/floatuntitf.zig
diff --git a/std/special/compiler_rt/floatuntitf_test.zig b/lib/std/special/compiler_rt/floatuntitf_test.zig
index 09f3eabb3e..09f3eabb3e 100644
--- a/std/special/compiler_rt/floatuntitf_test.zig
+++ b/lib/std/special/compiler_rt/floatuntitf_test.zig
diff --git a/std/special/compiler_rt/lshrti3.zig b/lib/std/special/compiler_rt/lshrti3.zig
index 329968ae40..329968ae40 100644
--- a/std/special/compiler_rt/lshrti3.zig
+++ b/lib/std/special/compiler_rt/lshrti3.zig
diff --git a/std/special/compiler_rt/lshrti3_test.zig b/lib/std/special/compiler_rt/lshrti3_test.zig
index 60f83d816e..60f83d816e 100644
--- a/std/special/compiler_rt/lshrti3_test.zig
+++ b/lib/std/special/compiler_rt/lshrti3_test.zig
diff --git a/std/special/compiler_rt/modti3.zig b/lib/std/special/compiler_rt/modti3.zig
index 16f2f38ba3..16f2f38ba3 100644
--- a/std/special/compiler_rt/modti3.zig
+++ b/lib/std/special/compiler_rt/modti3.zig
diff --git a/std/special/compiler_rt/modti3_test.zig b/lib/std/special/compiler_rt/modti3_test.zig
index 10f81d59d2..10f81d59d2 100644
--- a/std/special/compiler_rt/modti3_test.zig
+++ b/lib/std/special/compiler_rt/modti3_test.zig
diff --git a/std/special/compiler_rt/mulXf3.zig b/lib/std/special/compiler_rt/mulXf3.zig
index 51d40ad26f..51d40ad26f 100644
--- a/std/special/compiler_rt/mulXf3.zig
+++ b/lib/std/special/compiler_rt/mulXf3.zig
diff --git a/std/special/compiler_rt/mulXf3_test.zig b/lib/std/special/compiler_rt/mulXf3_test.zig
index 1c0c0fc043..1c0c0fc043 100644
--- a/std/special/compiler_rt/mulXf3_test.zig
+++ b/lib/std/special/compiler_rt/mulXf3_test.zig
diff --git a/std/special/compiler_rt/muldi3.zig b/lib/std/special/compiler_rt/muldi3.zig
index 7700777c16..7700777c16 100644
--- a/std/special/compiler_rt/muldi3.zig
+++ b/lib/std/special/compiler_rt/muldi3.zig
diff --git a/std/special/compiler_rt/muldi3_test.zig b/lib/std/special/compiler_rt/muldi3_test.zig
index db4daf1e1e..db4daf1e1e 100644
--- a/std/special/compiler_rt/muldi3_test.zig
+++ b/lib/std/special/compiler_rt/muldi3_test.zig
diff --git a/std/special/compiler_rt/mulodi4.zig b/lib/std/special/compiler_rt/mulodi4.zig
index 82e9ef3253..82e9ef3253 100644
--- a/std/special/compiler_rt/mulodi4.zig
+++ b/lib/std/special/compiler_rt/mulodi4.zig
diff --git a/std/special/compiler_rt/mulodi4_test.zig b/lib/std/special/compiler_rt/mulodi4_test.zig
index 7575c77044..7575c77044 100644
--- a/std/special/compiler_rt/mulodi4_test.zig
+++ b/lib/std/special/compiler_rt/mulodi4_test.zig
diff --git a/std/special/compiler_rt/muloti4.zig b/lib/std/special/compiler_rt/muloti4.zig
index ccde8e3e6c..ccde8e3e6c 100644
--- a/std/special/compiler_rt/muloti4.zig
+++ b/lib/std/special/compiler_rt/muloti4.zig
diff --git a/std/special/compiler_rt/muloti4_test.zig b/lib/std/special/compiler_rt/muloti4_test.zig
index 00144a8839..00144a8839 100644
--- a/std/special/compiler_rt/muloti4_test.zig
+++ b/lib/std/special/compiler_rt/muloti4_test.zig
diff --git a/std/special/compiler_rt/multi3.zig b/lib/std/special/compiler_rt/multi3.zig
index 799b1f575d..799b1f575d 100644
--- a/std/special/compiler_rt/multi3.zig
+++ b/lib/std/special/compiler_rt/multi3.zig
diff --git a/std/special/compiler_rt/multi3_test.zig b/lib/std/special/compiler_rt/multi3_test.zig
index 92c580e20f..92c580e20f 100644
--- a/std/special/compiler_rt/multi3_test.zig
+++ b/lib/std/special/compiler_rt/multi3_test.zig
diff --git a/std/special/compiler_rt/negXf2.zig b/lib/std/special/compiler_rt/negXf2.zig
index b71a503c1d..b71a503c1d 100644
--- a/std/special/compiler_rt/negXf2.zig
+++ b/lib/std/special/compiler_rt/negXf2.zig
diff --git a/std/special/compiler_rt/popcountdi2.zig b/lib/std/special/compiler_rt/popcountdi2.zig
index ea36b0ec44..ea36b0ec44 100644
--- a/std/special/compiler_rt/popcountdi2.zig
+++ b/lib/std/special/compiler_rt/popcountdi2.zig
diff --git a/std/special/compiler_rt/popcountdi2_test.zig b/lib/std/special/compiler_rt/popcountdi2_test.zig
index bedcbcd1de..bedcbcd1de 100644
--- a/std/special/compiler_rt/popcountdi2_test.zig
+++ b/lib/std/special/compiler_rt/popcountdi2_test.zig
diff --git a/std/special/compiler_rt/stack_probe.zig b/lib/std/special/compiler_rt/stack_probe.zig
index c3e534c8ec..c3e534c8ec 100644
--- a/std/special/compiler_rt/stack_probe.zig
+++ b/lib/std/special/compiler_rt/stack_probe.zig
diff --git a/std/special/compiler_rt/truncXfYf2.zig b/lib/std/special/compiler_rt/truncXfYf2.zig
index e4c4aa38a7..e4c4aa38a7 100644
--- a/std/special/compiler_rt/truncXfYf2.zig
+++ b/lib/std/special/compiler_rt/truncXfYf2.zig
diff --git a/std/special/compiler_rt/truncXfYf2_test.zig b/lib/std/special/compiler_rt/truncXfYf2_test.zig
index eccf7efb7e..eccf7efb7e 100644
--- a/std/special/compiler_rt/truncXfYf2_test.zig
+++ b/lib/std/special/compiler_rt/truncXfYf2_test.zig
diff --git a/std/special/compiler_rt/udivmod.zig b/lib/std/special/compiler_rt/udivmod.zig
index c3066153f3..c3066153f3 100644
--- a/std/special/compiler_rt/udivmod.zig
+++ b/lib/std/special/compiler_rt/udivmod.zig
diff --git a/std/special/compiler_rt/udivmoddi4.zig b/lib/std/special/compiler_rt/udivmoddi4.zig
index de86c845e5..de86c845e5 100644
--- a/std/special/compiler_rt/udivmoddi4.zig
+++ b/lib/std/special/compiler_rt/udivmoddi4.zig
diff --git a/std/special/compiler_rt/udivmoddi4_test.zig b/lib/std/special/compiler_rt/udivmoddi4_test.zig
index 17581fc569..17581fc569 100644
--- a/std/special/compiler_rt/udivmoddi4_test.zig
+++ b/lib/std/special/compiler_rt/udivmoddi4_test.zig
diff --git a/std/special/compiler_rt/udivmodti4.zig b/lib/std/special/compiler_rt/udivmodti4.zig
index c74dff512d..c74dff512d 100644
--- a/std/special/compiler_rt/udivmodti4.zig
+++ b/lib/std/special/compiler_rt/udivmodti4.zig
diff --git a/std/special/compiler_rt/udivmodti4_test.zig b/lib/std/special/compiler_rt/udivmodti4_test.zig
index fdeae7c02b..fdeae7c02b 100644
--- a/std/special/compiler_rt/udivmodti4_test.zig
+++ b/lib/std/special/compiler_rt/udivmodti4_test.zig
diff --git a/std/special/compiler_rt/udivti3.zig b/lib/std/special/compiler_rt/udivti3.zig
index ab451859bf..ab451859bf 100644
--- a/std/special/compiler_rt/udivti3.zig
+++ b/lib/std/special/compiler_rt/udivti3.zig
diff --git a/std/special/compiler_rt/umodti3.zig b/lib/std/special/compiler_rt/umodti3.zig
index 7add0b2ffe..7add0b2ffe 100644
--- a/std/special/compiler_rt/umodti3.zig
+++ b/lib/std/special/compiler_rt/umodti3.zig
diff --git a/std/special/init-exe/build.zig b/lib/std/special/init-exe/build.zig
index 0b7410f2ad..0b7410f2ad 100644
--- a/std/special/init-exe/build.zig
+++ b/lib/std/special/init-exe/build.zig
diff --git a/std/special/init-exe/src/main.zig b/lib/std/special/init-exe/src/main.zig
index 128820d3ee..128820d3ee 100644
--- a/std/special/init-exe/src/main.zig
+++ b/lib/std/special/init-exe/src/main.zig
diff --git a/std/special/init-lib/build.zig b/lib/std/special/init-lib/build.zig
index 558e447c15..558e447c15 100644
--- a/std/special/init-lib/build.zig
+++ b/lib/std/special/init-lib/build.zig
diff --git a/std/special/init-lib/src/main.zig b/lib/std/special/init-lib/src/main.zig
index 747bb08573..747bb08573 100644
--- a/std/special/init-lib/src/main.zig
+++ b/lib/std/special/init-lib/src/main.zig
diff --git a/std/special/panic.zig b/lib/std/special/panic.zig
index f42085126b..f42085126b 100644
--- a/std/special/panic.zig
+++ b/lib/std/special/panic.zig
diff --git a/std/special/start.zig b/lib/std/special/start.zig
index ca7d7986ed..ca7d7986ed 100644
--- a/std/special/start.zig
+++ b/lib/std/special/start.zig
diff --git a/std/special/start_lib.zig b/lib/std/special/start_lib.zig
index 701eee389d..701eee389d 100644
--- a/std/special/start_lib.zig
+++ b/lib/std/special/start_lib.zig
diff --git a/std/special/start_windows_tls.zig b/lib/std/special/start_windows_tls.zig
index 71165d355b..71165d355b 100644
--- a/std/special/start_windows_tls.zig
+++ b/lib/std/special/start_windows_tls.zig
diff --git a/std/special/test_runner.zig b/lib/std/special/test_runner.zig
index db01293059..db01293059 100644
--- a/std/special/test_runner.zig
+++ b/lib/std/special/test_runner.zig
diff --git a/std/spinlock.zig b/lib/std/spinlock.zig
index 905460a2d0..905460a2d0 100644
--- a/std/spinlock.zig
+++ b/lib/std/spinlock.zig
diff --git a/std/statically_initialized_mutex.zig b/lib/std/statically_initialized_mutex.zig
index 2ad47b5d91..2ad47b5d91 100644
--- a/std/statically_initialized_mutex.zig
+++ b/lib/std/statically_initialized_mutex.zig
diff --git a/std/std.zig b/lib/std/std.zig
index 1c64242c4b..1c64242c4b 100644
--- a/std/std.zig
+++ b/lib/std/std.zig
diff --git a/std/testing.zig b/lib/std/testing.zig
index 7f347b0c24..7f347b0c24 100644
--- a/std/testing.zig
+++ b/lib/std/testing.zig
diff --git a/std/thread.zig b/lib/std/thread.zig
index 278fcc827c..278fcc827c 100644
--- a/std/thread.zig
+++ b/lib/std/thread.zig
diff --git a/std/time.zig b/lib/std/time.zig
index caf6c31b31..caf6c31b31 100644
--- a/std/time.zig
+++ b/lib/std/time.zig
diff --git a/std/time/epoch.zig b/lib/std/time/epoch.zig
index fc031521a5..fc031521a5 100644
--- a/std/time/epoch.zig
+++ b/lib/std/time/epoch.zig
diff --git a/std/unicode.zig b/lib/std/unicode.zig
index 2e96147166..2e96147166 100644
--- a/std/unicode.zig
+++ b/lib/std/unicode.zig
diff --git a/std/unicode/throughput_test.zig b/lib/std/unicode/throughput_test.zig
index f8b18af734..f8b18af734 100644
--- a/std/unicode/throughput_test.zig
+++ b/lib/std/unicode/throughput_test.zig
diff --git a/std/valgrind.zig b/lib/std/valgrind.zig
index 0d7f79dfa2..0d7f79dfa2 100644
--- a/std/valgrind.zig
+++ b/lib/std/valgrind.zig
diff --git a/std/valgrind/callgrind.zig b/lib/std/valgrind/callgrind.zig
index d008294870..d008294870 100644
--- a/std/valgrind/callgrind.zig
+++ b/lib/std/valgrind/callgrind.zig
diff --git a/std/valgrind/memcheck.zig b/lib/std/valgrind/memcheck.zig
index 2830f58dbd..2830f58dbd 100644
--- a/std/valgrind/memcheck.zig
+++ b/lib/std/valgrind/memcheck.zig
diff --git a/std/zig.zig b/lib/std/zig.zig
index 494c9d0057..494c9d0057 100644
--- a/std/zig.zig
+++ b/lib/std/zig.zig
diff --git a/std/zig/ast.zig b/lib/std/zig/ast.zig
index 79e6647144..79e6647144 100644
--- a/std/zig/ast.zig
+++ b/lib/std/zig/ast.zig
diff --git a/std/zig/parse.zig b/lib/std/zig/parse.zig
index 151784284d..151784284d 100644
--- a/std/zig/parse.zig
+++ b/lib/std/zig/parse.zig
diff --git a/std/zig/parse_string_literal.zig b/lib/std/zig/parse_string_literal.zig
index acae0b64c7..acae0b64c7 100644
--- a/std/zig/parse_string_literal.zig
+++ b/lib/std/zig/parse_string_literal.zig
diff --git a/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
index 2c7978ba83..2c7978ba83 100644
--- a/std/zig/parser_test.zig
+++ b/lib/std/zig/parser_test.zig
diff --git a/std/zig/perf_test.zig b/lib/std/zig/perf_test.zig
index e0723d8519..e0723d8519 100644
--- a/std/zig/perf_test.zig
+++ b/lib/std/zig/perf_test.zig
diff --git a/std/zig/render.zig b/lib/std/zig/render.zig
index 6268a056f5..6268a056f5 100644
--- a/std/zig/render.zig
+++ b/lib/std/zig/render.zig
diff --git a/std/zig/tokenizer.zig b/lib/std/zig/tokenizer.zig
index b0a6cd1122..b0a6cd1122 100644
--- a/std/zig/tokenizer.zig
+++ b/lib/std/zig/tokenizer.zig
diff --git a/src/codegen.cpp b/src/codegen.cpp
index f3bb210902..a1da6752b3 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -10367,8 +10367,7 @@ CodeGen *create_child_codegen(CodeGen *parent_gen, Buf *root_src_path, OutType o
         ZigLibCInstallation *libc)
 {
     CodeGen *child_gen = codegen_create(nullptr, root_src_path, parent_gen->zig_target, out_type,
-        parent_gen->build_mode, parent_gen->zig_lib_dir, parent_gen->zig_std_dir, libc, get_stage1_cache_path(),
-        false);
+        parent_gen->build_mode, parent_gen->zig_lib_dir, libc, get_stage1_cache_path(), false);
     child_gen->disable_gen_h = true;
     child_gen->want_stack_check = WantStackCheckDisabled;
     child_gen->verbose_tokenize = parent_gen->verbose_tokenize;
@@ -10396,7 +10395,7 @@ CodeGen *create_child_codegen(CodeGen *parent_gen, Buf *root_src_path, OutType o
 }
 
 CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget *target,
-    OutType out_type, BuildMode build_mode, Buf *override_lib_dir, Buf *override_std_dir,
+    OutType out_type, BuildMode build_mode, Buf *override_lib_dir,
     ZigLibCInstallation *libc, Buf *cache_dir, bool is_test_build)
 {
     CodeGen *g = allocate<CodeGen>(1);
@@ -10414,12 +10413,8 @@ CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget
         g->zig_lib_dir = override_lib_dir;
     }
 
-    if (override_std_dir == nullptr) {
-        g->zig_std_dir = buf_alloc();
-        os_path_join(g->zig_lib_dir, buf_create_from_str("std"), g->zig_std_dir);
-    } else {
-        g->zig_std_dir = override_std_dir;
-    }
+    g->zig_std_dir = buf_alloc();
+    os_path_join(g->zig_lib_dir, buf_create_from_str("std"), g->zig_std_dir);
 
     g->zig_c_headers_dir = buf_alloc();
     os_path_join(g->zig_lib_dir, buf_create_from_str("include"), g->zig_c_headers_dir);
diff --git a/src/codegen.hpp b/src/codegen.hpp
index 794a0fd5a6..5be15b0513 100644
--- a/src/codegen.hpp
+++ b/src/codegen.hpp
@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget *target,
-    OutType out_type, BuildMode build_mode, Buf *zig_lib_dir, Buf *override_std_dir,
+    OutType out_type, BuildMode build_mode, Buf *zig_lib_dir,
     ZigLibCInstallation *libc, Buf *cache_dir, bool is_test_build);
 
 CodeGen *create_child_codegen(CodeGen *parent_gen, Buf *root_src_path, OutType out_type,
diff --git a/src/compiler.cpp b/src/compiler.cpp
index 5d401f1851..50be7416b2 100644
--- a/src/compiler.cpp
+++ b/src/compiler.cpp
@@ -130,37 +130,35 @@ Error get_compiler_id(Buf **result) {
 }
 
 static bool test_zig_install_prefix(Buf *test_path, Buf *out_zig_lib_dir) {
-    Buf lib_buf = BUF_INIT;
-    buf_init_from_str(&lib_buf, "lib");
-
-    Buf zig_buf = BUF_INIT;
-    buf_init_from_str(&zig_buf, "zig");
-
-    Buf std_buf = BUF_INIT;
-    buf_init_from_str(&std_buf, "std");
-
-    Buf std_zig_buf = BUF_INIT;
-    buf_init_from_str(&std_zig_buf, "std.zig");
-
-    Buf test_lib_dir = BUF_INIT;
-    Buf test_zig_dir = BUF_INIT;
-    Buf test_std_dir = BUF_INIT;
-    Buf test_index_file = BUF_INIT;
-
-    os_path_join(test_path, &lib_buf, &test_lib_dir);
-    os_path_join(&test_lib_dir, &zig_buf, &test_zig_dir);
-    os_path_join(&test_zig_dir, &std_buf, &test_std_dir);
-    os_path_join(&test_std_dir, &std_zig_buf, &test_index_file);
-
-    int err;
-    bool exists;
-    if ((err = os_file_exists(&test_index_file, &exists))) {
-        exists = false;
+    {
+        Buf *test_zig_dir = buf_sprintf("%s" OS_SEP "lib" OS_SEP "zig", buf_ptr(test_path));
+        Buf *test_index_file = buf_sprintf("%s" OS_SEP "std" OS_SEP "std.zig", buf_ptr(test_zig_dir));
+        int err;
+        bool exists;
+        if ((err = os_file_exists(test_index_file, &exists))) {
+            exists = false;
+        }
+        if (exists) {
+            buf_init_from_buf(out_zig_lib_dir, test_zig_dir);
+            return true;
+        }
     }
-    if (exists) {
-        buf_init_from_buf(out_zig_lib_dir, &test_zig_dir);
-        return true;
+
+    // Also try without "zig"
+    {
+        Buf *test_zig_dir = buf_sprintf("%s" OS_SEP "lib", buf_ptr(test_path));
+        Buf *test_index_file = buf_sprintf("%s" OS_SEP "std" OS_SEP "std.zig", buf_ptr(test_zig_dir));
+        int err;
+        bool exists;
+        if ((err = os_file_exists(test_index_file, &exists))) {
+            exists = false;
+        }
+        if (exists) {
+            buf_init_from_buf(out_zig_lib_dir, test_zig_dir);
+            return true;
+        }
     }
+
     return false;
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 68ff97e4db..6f1eff174b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -88,8 +88,7 @@ static int print_full_usage(const char *arg0, FILE *file, int return_code) {
         "  -dirafter [dir]              same as -isystem but do it last\n"
         "  -isystem [dir]               add additional search path for other .h files\n"
         "  -mllvm [arg]                 (unsupported) forward an arg to LLVM's option processing\n"
-        "  --override-std-dir [arg]     override path to Zig standard library\n"
-        "  --override-lib-dir [arg]     override path to Zig lib library\n"
+        "  --override-lib-dir [arg]     override path to Zig lib directory\n"
         "  -ffunction-sections          places each function in a separate section\n"
         "  -D[macro]=[value]            define C [macro] to [value] (1 if [value] omitted)\n"
         "\n"
@@ -490,7 +489,6 @@ int main(int argc, char **argv) {
     bool want_single_threaded = false;
     bool disable_gen_h = false;
     bool bundle_compiler_rt = false;
-    Buf *override_std_dir = nullptr;
     Buf *override_lib_dir = nullptr;
     Buf *main_pkg_path = nullptr;
     ValgrindSupport valgrind_support = ValgrindSupportAuto;
@@ -526,12 +524,6 @@ int main(int argc, char **argv) {
             } else if (i + 1 < argc && strcmp(argv[i], "--cache-dir") == 0) {
                 cache_dir = argv[i + 1];
                 i += 1;
-            } else if (i + 1 < argc && strcmp(argv[i], "--override-std-dir") == 0) {
-                override_std_dir = buf_create_from_str(argv[i + 1]);
-                i += 1;
-
-                args.append("--override-std-dir");
-                args.append(buf_ptr(override_std_dir));
             } else if (i + 1 < argc && strcmp(argv[i], "--override-lib-dir") == 0) {
                 override_lib_dir = buf_create_from_str(argv[i + 1]);
                 i += 1;
@@ -590,7 +582,7 @@ int main(int argc, char **argv) {
         }
 
         CodeGen *g = codegen_create(main_pkg_path, build_runner_path, &target, OutTypeExe,
-                BuildModeDebug, override_lib_dir, override_std_dir, nullptr, &full_cache_dir, false);
+                BuildModeDebug, override_lib_dir, nullptr, &full_cache_dir, false);
         g->valgrind_support = valgrind_support;
         g->enable_time_report = timing_info;
         codegen_set_out_name(g, buf_create_from_str("build"));
@@ -787,8 +779,6 @@ int main(int argc, char **argv) {
                     clang_argv.append(argv[i]);
 
                     llvm_argv.append(argv[i]);
-                } else if (strcmp(arg, "--override-std-dir") == 0) {
-                    override_std_dir = buf_create_from_str(argv[i]);
                 } else if (strcmp(arg, "--override-lib-dir") == 0) {
                     override_lib_dir = buf_create_from_str(argv[i]);
                 } else if (strcmp(arg, "--main-pkg-path") == 0) {
@@ -1036,7 +1026,7 @@ int main(int argc, char **argv) {
     }
     case CmdBuiltin: {
         CodeGen *g = codegen_create(main_pkg_path, nullptr, &target,
-                out_type, build_mode, override_lib_dir, override_std_dir, nullptr, nullptr, false);
+                out_type, build_mode, override_lib_dir, nullptr, nullptr, false);
         codegen_set_strip(g, strip);
         for (size_t i = 0; i < link_libs.length; i += 1) {
             LinkLib *link_lib = codegen_add_link_lib(g, buf_create_from_str(link_libs.at(i)));
@@ -1140,7 +1130,7 @@ int main(int argc, char **argv) {
                 cache_dir_buf = buf_create_from_str(cache_dir);
             }
             CodeGen *g = codegen_create(main_pkg_path, zig_root_source_file, &target, out_type, build_mode,
-                    override_lib_dir, override_std_dir, libc, cache_dir_buf, cmd == CmdTest);
+                    override_lib_dir, libc, cache_dir_buf, cmd == CmdTest);
             if (llvm_argv.length >= 2) codegen_set_llvm_argv(g, llvm_argv.items + 1, llvm_argv.length - 2);
             g->valgrind_support = valgrind_support;
             g->want_pic = want_pic;
diff --git a/test/tests.zig b/test/tests.zig
index 20c8276e42..1b51a0c694 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -408,7 +408,7 @@ pub fn addPkgTests(
         if (test_target.link_libc) {
             these_tests.linkSystemLibrary("c");
         }
-        these_tests.overrideStdDir("std");
+        these_tests.overrideZigLibDir("lib");
         these_tests.enable_wine = is_wine_enabled;
         these_tests.enable_qemu = is_qemu_enabled;
         these_tests.glibc_multi_install_dir = glibc_dir;