| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-06-03 03:57:56+02:00 |
| committer |  GitHub <noreply@github.com> 2025-06-03 03:57:56+02:00 |
| log | f4f4460e178d13e62cc0031ef5a51a524101b9a0 |
| tree | 1f8005d002d455a735c5b4a9849a010d06068610 |
| parent | 041eedc1cf2a5b7d6489a44cee8a5037a4af675f |
| parent | 87f8f47ba508b684d03c13b850cac3fb72efac26 |
| signature |  Signed by PGP key B5690EEEBB952194 |
Merge pull request #23525 from alexrp/ci-max-rss
`std.Build`: Demote errors for exceeding `max_rss` to warnings.3 files changed, 0 insertions(+), 6 deletions(-)
- CMakeLists.txt
lib- compiler
- std
- Build
CMakeLists.txt-4
| ... | @@ -1001,10 +1001,6 @@ if(NOT "${ZIG_TARGET_DYNAMIC_LINKER}" STREQUAL "") | ... | @@ -1001,10 +1001,6 @@ if(NOT "${ZIG_TARGET_DYNAMIC_LINKER}" STREQUAL "") |
| 1001 | list(APPEND ZIG_BUILD_ARGS "-Ddynamic-linker=${ZIG_TARGET_DYNAMIC_LINKER}") | 1001 | list(APPEND ZIG_BUILD_ARGS "-Ddynamic-linker=${ZIG_TARGET_DYNAMIC_LINKER}") |
| 1002 | endif() | 1002 | endif() |
| 1003 | 1003 | ||
| 1004 | if(MINGW AND "${ZIG_HOST_TARGET_ARCH}" STREQUAL "x86") | ||
| 1005 | list(APPEND ZIG_BUILD_ARGS --maxrss 7000000000) | ||
| 1006 | endif() | ||
| 1007 | |||
| 1008 | 1004 | ||
| 1009 | add_custom_target(stage3 ALL | 1005 | add_custom_target(stage3 ALL |
| 1010 | DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig" | 1006 | DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig" |
lib/compiler/build_runner.zig-1
| ... | @@ -599,7 +599,6 @@ fn prepare( | ... | @@ -599,7 +599,6 @@ fn prepare( |
| 599 | if (run.max_rss_is_default) { | 599 | if (run.max_rss_is_default) { |
| 600 | std.debug.print("note: use --maxrss to override the default", .{}); | 600 | std.debug.print("note: use --maxrss to override the default", .{}); |
| 601 | } | 601 | } |
| 602 | return uncleanExit(); | ||
| 603 | } | 602 | } |
| 604 | } | 603 | } |
| 605 | } | 604 | } |
lib/std/Build/Step.zig-1
| ... | @@ -247,7 +247,6 @@ pub fn make(s: *Step, options: MakeOptions) error{ MakeFailed, MakeSkipped }!voi | ... | @@ -247,7 +247,6 @@ pub fn make(s: *Step, options: MakeOptions) error{ MakeFailed, MakeSkipped }!voi |
| 247 | s.result_peak_rss, s.max_rss, | 247 | s.result_peak_rss, s.max_rss, |
| 248 | }) catch @panic("OOM"); | 248 | }) catch @panic("OOM"); |
| 249 | s.result_error_msgs.append(arena, msg) catch @panic("OOM"); | 249 | s.result_error_msgs.append(arena, msg) catch @panic("OOM"); |
| 250 | return error.MakeFailed; | ||
| 251 | } | 250 | } |
| 252 | } | 251 | } |
| 253 | 252 |