authorgravatar for mail@isaacfreund.comIsaac Freund <mail@isaacfreund.com> 2021-04-29 14:34:45+02:00
committergravatar for mail@isaacfreund.comIsaac Freund <mail@isaacfreund.com> 2021-04-29 23:58:45+02:00
log5079d11b213a02e9d9465f3371d0833021cfc636
treefb97ab62b124e3e44b5e380192f8582fd0374336
parent2ed368fb92a96a9ec2f48459b56f6eace7b2bff4
signaturelock-open Commit is signed but in an unrecognized format.

std/build: change default install prefix to zig-out

Currently the default install prefix is $BUILD_ROOT/zig-cache, but mixing cache and artifacts makes little sense. Instead make $BUILD_ROOT/zig-out the default.

2 files changed, 3 insertions(+), 1 deletions(-)

.gitignore+1
...@@ -10,6 +10,7 @@...@@ -10,6 +10,7 @@
10# -andrewrk10# -andrewrk
1111
12zig-cache/12zig-cache/
13zig-out/
13/release/14/release/
14/debug/15/debug/
15/build/16/build/
lib/std/build.zig+2-1
...@@ -195,7 +195,8 @@ pub const Builder = struct {...@@ -195,7 +195,8 @@ pub const Builder = struct {
195 self.install_prefix = install_prefix orelse "/usr";195 self.install_prefix = install_prefix orelse "/usr";
196 self.install_path = fs.path.join(self.allocator, &[_][]const u8{ dest_dir, self.install_prefix }) catch unreachable;196 self.install_path = fs.path.join(self.allocator, &[_][]const u8{ dest_dir, self.install_prefix }) catch unreachable;
197 } else {197 } else {
198 self.install_prefix = install_prefix orelse self.cache_root;198 self.install_prefix = install_prefix orelse
199 (fs.path.join(self.allocator, &[_][]const u8{ self.build_root, "zig-out" }) catch unreachable);
199 self.install_path = self.install_prefix;200 self.install_path = self.install_prefix;
200 }201 }
201 self.lib_dir = fs.path.join(self.allocator, &[_][]const u8{ self.install_path, "lib" }) catch unreachable;202 self.lib_dir = fs.path.join(self.allocator, &[_][]const u8{ self.install_path, "lib" }) catch unreachable;