Commit 683814190bde2340dbecf8e48ae1629900f51306 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-01-02 22:05:31-08:00
committer	GitHub <noreply@github.com> 2021-01-02 22:05:31-08:00
log	683814190bde2340dbecf8e48ae1629900f51306
tree	95235ea1016445971aa65c86b694c1d0b572bc40
parent	d8f3f14532c4b5d65377efaef015c3855137dccf
parent	33e53d729493bdfc76726dd2d247e1998e321930
signature	Signed by PGP key 4AEE18F83AFDEB23

Implement #7296

3 files changed, 11 insertions(+), 5 deletions(-)

.gitignore+2

lib/std/build.zig+8-4

 @@ -200,12 +200,16 @@ pub const Builder = struct {
             const install_prefix = self.install_prefix orelse "/usr";
             self.install_path = fs.path.join(self.allocator, &[_][]const u8{ dest_dir, install_prefix }) catch unreachable;
         } else {
-            const install_prefix = self.install_prefix orelse blk: {
+            self.install_path = self.install_prefix orelse blk: {
-                const p = self.cache_root;
+                const p = if (self.release_mode) |mode| switch (mode) {
+                    .Debug => "debug",
+                    .ReleaseSafe => "release",
+                    .ReleaseFast => "release",
+                    .ReleaseSmall => "release",
+                } else "debug";
                 self.install_prefix = p;
-                break :blk p;
+                break :blk self.pathFromRoot(p);
             };
-            self.install_path = install_prefix;
         }
         self.lib_dir = fs.path.join(self.allocator, &[_][]const u8{ self.install_path, "lib" }) catch unreachable;
         self.exe_dir = fs.path.join(self.allocator, &[_][]const u8{ self.install_path, "bin" }) catch unreachable;

lib/std/special/build_runner.zig+1-1

 @@ -134,8 +134,8 @@ pub fn main() !void {
         }
     }
-    builder.resolveInstallPrefix();
     try runBuild(builder);
+    builder.resolveInstallPrefix();
     if (builder.validateUserInputDidItFail())
         return usageAndErr(builder, true, stderr_stream);