authorgravatar for alex.ambrose@sonatus.comAlex Ambrose <alex.ambrose@sonatus.com> 2024-06-19 14:40:21-07:00
committergravatar for luuk@degram.devLuuk de Gram <luuk@degram.dev> 2024-06-20 07:34:24+02:00
logccd3cc3266762c1fea93cdc0190eaf71718d9e6a
tree7fb5f47f8b8f5d78f210c1b2846b4c0b200325a0
parente5a3a10a5a255cc01f3b9944a09a76753e32a8b7

Parse WASM linker flags as base 10, like clang

Resolves #19536

1 files changed, 3 insertions(+), 3 deletions(-)

src/main.zig+3-3
......@@ -2252,19 +2252,19 @@ fn buildOutputType(
22522252 entry = .disabled;
22532253 } else if (mem.eql(u8, arg, "--initial-memory")) {
22542254 const next_arg = linker_args_it.nextOrFatal();
2255 linker_initial_memory = std.fmt.parseUnsigned(u32, eatIntPrefix(next_arg, 16), 16) catch |err| {
2255 linker_initial_memory = std.fmt.parseUnsigned(u32, next_arg, 10) catch |err| {
22562256 fatal("unable to parse initial memory size '{s}': {s}", .{ next_arg, @errorName(err) });
22572257 };
22582258 } else if (mem.eql(u8, arg, "--max-memory")) {
22592259 const next_arg = linker_args_it.nextOrFatal();
2260 linker_max_memory = std.fmt.parseUnsigned(u32, eatIntPrefix(next_arg, 16), 16) catch |err| {
2260 linker_max_memory = std.fmt.parseUnsigned(u32, next_arg, 10) catch |err| {
22612261 fatal("unable to parse max memory size '{s}': {s}", .{ next_arg, @errorName(err) });
22622262 };
22632263 } else if (mem.eql(u8, arg, "--shared-memory")) {
22642264 create_module.opts.shared_memory = true;
22652265 } else if (mem.eql(u8, arg, "--global-base")) {
22662266 const next_arg = linker_args_it.nextOrFatal();
2267 linker_global_base = std.fmt.parseUnsigned(u32, eatIntPrefix(next_arg, 16), 16) catch |err| {
2267 linker_global_base = std.fmt.parseUnsigned(u32, next_arg, 10) catch |err| {
22682268 fatal("unable to parse global base '{s}': {s}", .{ next_arg, @errorName(err) });
22692269 };
22702270 } else if (mem.eql(u8, arg, "--export")) {