Skip to content

Implement #7296#7612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewrk merged 2 commits into from
Jan 3, 2021
Merged

Implement #7296 #7612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1a1929
Fix #7296:
g-w1 Dec 31, 2020
33e53d7
update .gitignore to include /release/ and /debug/
g-w1 Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
# -andrewrk

zig-cache/
/release/
/debug/
/build/
/build-*/
/docgen_tmp/
12 changes: 8 additions & 4 deletions lib/std/build.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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: {
const p = self.cache_root;
self.install_path = self.install_prefix orelse blk: {
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;
Expand Down
2 changes: 1 addition & 1 deletion lib/std/special/build_runner.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,8 +134,8 @@ pub fn main() !void {
}
}

builder.resolveInstallPrefix();
try runBuild(builder);
builder.resolveInstallPrefix();

if (builder.validateUserInputDidItFail())
return usageAndErr(builder, true, stderr_stream);
Expand Down