Skip to content

Commit f4f4460

Browse files
authored
Merge pull request #23525 from alexrp/ci-max-rss
`std.Build`: Demote errors for exceeding `max_rss` to warnings.
2 parents 041eedc + 87f8f47 commit f4f4460

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,10 +1001,6 @@ if(NOT "${ZIG_TARGET_DYNAMIC_LINKER}" STREQUAL "")
10011001
list(APPEND ZIG_BUILD_ARGS "-Ddynamic-linker=${ZIG_TARGET_DYNAMIC_LINKER}")
10021002
endif()
10031003

1004-
if(MINGW AND "${ZIG_HOST_TARGET_ARCH}" STREQUAL "x86")
1005-
list(APPEND ZIG_BUILD_ARGS --maxrss 7000000000)
1006-
endif()
1007-
10081004

10091005
add_custom_target(stage3 ALL
10101006
DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig"

lib/compiler/build_runner.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,6 @@ fn prepare(
599599
if (run.max_rss_is_default) {
600600
std.debug.print("note: use --maxrss to override the default", .{});
601601
}
602-
return uncleanExit();
603602
}
604603
}
605604
}

lib/std/Build/Step.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ pub fn make(s: *Step, options: MakeOptions) error{ MakeFailed, MakeSkipped }!voi
247247
s.result_peak_rss, s.max_rss,
248248
}) catch @panic("OOM");
249249
s.result_error_msgs.append(arena, msg) catch @panic("OOM");
250-
return error.MakeFailed;
251250
}
252251
}
253252

0 commit comments

Comments
 (0)