aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-10-18 14:08:15 -0700
committerAndrew Kelley <andrew@ziglang.org>2022-10-18 14:16:07 -0700
commit4f9345d20b3b95a1ccfe894bddd8ba5879c10c31 (patch)
tree65922fdc968b359fa73cce0a1ae1aa2cef3a18eb /tools
parentb120c819dbd15b23cf5392a5d5bdd8d8af18ead0 (diff)
downloadzig-4f9345d20b3b95a1ccfe894bddd8ba5879c10c31.tar.gz
zig-4f9345d20b3b95a1ccfe894bddd8ba5879c10c31.zip
Revert "adding `static` and `dynamic` ZigEquivalent
enums so that we can branch to set `link_mode` properly when we iterate over the clang arguments. also replaced `dynamic` flag in clang_options_data.zig with proper definition similarly to `static`." This reverts commit 6af0eeb58d1d220d407ce4c463eaeb25b35f2761. This change needs more careful consideration. It regressed zig-bootstrap due to cmake passing `-static -lkernel32` and zig failing with error.UnableToStaticLink. See https://github.com/ziglang/zig-bootstrap/issues/134
Diffstat (limited to 'tools')
-rw-r--r--tools/update_clang_options.zig10
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 4f76453967..92e0757ac7 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -492,14 +492,6 @@ const known_options = [_]KnownOpt{
.name = "compress-debug-sections=",
.ident = "compress_debug_sections",
},
- .{
- .name = "dynamic",
- .ident = "dynamic",
- },
- .{
- .name = "static",
- .ident = "static",
- },
};
const blacklisted_options = [_][]const u8{};
@@ -806,7 +798,7 @@ fn objSyntax(obj: *json.ObjectMap) ?Syntax {
} else if (std.mem.eql(u8, superclass, "CLRemainingArgsJoined")) {
return .remaining_args_joined;
} else if (std.mem.eql(u8, superclass, "MultiArg")) {
- return Syntax{ .multi_arg = num_args };
+ return .{ .multi_arg = num_args };
}
}
const name = obj.get("Name").?.String;