mirror of
https://github.com/ziglang/zig.git
synced 2026-02-12 20:37:54 +00:00
Merge pull request #23525 from alexrp/ci-max-rss
`std.Build`: Demote errors for exceeding `max_rss` to warnings.
This commit is contained in:
commit
f4f4460e17
@ -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"
|
||||
|
||||
@ -599,7 +599,6 @@ fn prepare(
|
||||
if (run.max_rss_is_default) {
|
||||
std.debug.print("note: use --maxrss to override the default", .{});
|
||||
}
|
||||
return uncleanExit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user