From 5079d11b213a02e9d9465f3371d0833021cfc636 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 29 Apr 2021 14:34:45 +0200 Subject: [PATCH] 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. --- .gitignore | 1 + lib/std/build.zig | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9fa6f71cc79373bc1b874de726451fc8cbf56f92..feda423c10de3558421a2e3dbb2263e084a50849 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ # -andrewrk zig-cache/ +zig-out/ /release/ /debug/ /build/ diff --git a/lib/std/build.zig b/lib/std/build.zig index fce3a0bcebf5b9c65a5d0cae28a40eda4b9a9208..1811073279aa66841dfc12b6e871eb916fff0af8 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -195,7 +195,8 @@ pub const Builder = struct { self.install_prefix = install_prefix orelse "/usr"; self.install_path = fs.path.join(self.allocator, &[_][]const u8{ dest_dir, self.install_prefix }) catch unreachable; } else { - self.install_prefix = install_prefix orelse self.cache_root; + self.install_prefix = install_prefix orelse + (fs.path.join(self.allocator, &[_][]const u8{ self.build_root, "zig-out" }) catch unreachable); self.install_path = self.install_prefix; } self.lib_dir = fs.path.join(self.allocator, &[_][]const u8{ self.install_path, "lib" }) catch unreachable; -- 2.54.0