aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-12-16 00:39:36 -0700
committerAndrew Kelley <andrew@ziglang.org>2024-01-01 17:51:20 -0700
commit2047a6b82d2e6cdbddde3e7f1c93df9e72216052 (patch)
treec9717626d48bc85a0e5dbe12bb2d815241ac9c94 /src/main.zig
parent46297087871dec88c2b632d057f1e55b662126df (diff)
downloadzig-2047a6b82d2e6cdbddde3e7f1c93df9e72216052.tar.gz
zig-2047a6b82d2e6cdbddde3e7f1c93df9e72216052.zip
fix remaining compile errors except one
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/main.zig b/src/main.zig
index 26e1d79a7b..f412658a67 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -874,8 +874,8 @@ fn buildOutputType(
var override_lib_dir: ?[]const u8 = try EnvVar.ZIG_LIB_DIR.get(arena);
var clang_preprocessor_mode: Compilation.ClangPreprocessorMode = .no;
var subsystem: ?std.Target.SubSystem = null;
- var major_subsystem_version: ?u32 = null;
- var minor_subsystem_version: ?u32 = null;
+ var major_subsystem_version: ?u16 = null;
+ var minor_subsystem_version: ?u16 = null;
var enable_link_snapshots: bool = false;
var debug_incremental: bool = false;
var install_name: ?[]const u8 = null;
@@ -2321,21 +2321,17 @@ fn buildOutputType(
_ = linker_args_it.nextOrFatal();
} else if (mem.eql(u8, arg, "--major-subsystem-version")) {
const major = linker_args_it.nextOrFatal();
- major_subsystem_version = std.fmt.parseUnsigned(
- u32,
- major,
- 10,
- ) catch |err| {
- fatal("unable to parse major subsystem version '{s}': {s}", .{ major, @errorName(err) });
+ major_subsystem_version = std.fmt.parseUnsigned(u16, major, 10) catch |err| {
+ fatal("unable to parse major subsystem version '{s}': {s}", .{
+ major, @errorName(err),
+ });
};
} else if (mem.eql(u8, arg, "--minor-subsystem-version")) {
const minor = linker_args_it.nextOrFatal();
- minor_subsystem_version = std.fmt.parseUnsigned(
- u32,
- minor,
- 10,
- ) catch |err| {
- fatal("unable to parse minor subsystem version '{s}': {s}", .{ minor, @errorName(err) });
+ minor_subsystem_version = std.fmt.parseUnsigned(u16, minor, 10) catch |err| {
+ fatal("unable to parse minor subsystem version '{s}': {s}", .{
+ minor, @errorName(err),
+ });
};
} else if (mem.eql(u8, arg, "-framework")) {
try frameworks.put(arena, linker_args_it.nextOrFatal(), .{});