Skip to content

std.Build: Demote errors for exceeding max_rss to warnings. #23525

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
alexrp merged 2 commits into from
Jun 3, 2025
Merged

std.Build: Demote errors for exceeding max_rss to warnings. #23525

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
e3b8aec
Revert "Allocate enough memory when building zig2"
alexrp Apr 10, 2025
87f8f47
std.Build: Demote errors for exceeding max_rss to warnings.
alexrp Jun 2, 2025
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
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,10 +1001,6 @@ if(NOT "${ZIG_TARGET_DYNAMIC_LINKER}" STREQUAL "")
list(APPEND ZIG_BUILD_ARGS "-Ddynamic-linker=${ZIG_TARGET_DYNAMIC_LINKER}")
endif()

if(MINGW AND "${ZIG_HOST_TARGET_ARCH}" STREQUAL "x86")
list(APPEND ZIG_BUILD_ARGS --maxrss 7000000000)
endif()


add_custom_target(stage3 ALL
DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig"
Expand Down
1 change: 0 additions & 1 deletion lib/compiler/build_runner.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,6 @@ fn prepare(
if (run.max_rss_is_default) {
std.debug.print("note: use --maxrss to override the default", .{});
}
return uncleanExit();
}
}
}
Expand Down
1 change: 0 additions & 1 deletion lib/std/Build/Step.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ pub fn make(s: *Step, options: MakeOptions) error{ MakeFailed, MakeSkipped }!voi
s.result_peak_rss, s.max_rss,
}) catch @panic("OOM");
s.result_error_msgs.append(arena, msg) catch @panic("OOM");
return error.MakeFailed;
}
}

Expand Down