diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-10-18 14:08:15 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-10-18 14:16:07 -0700 |
| commit | 4f9345d20b3b95a1ccfe894bddd8ba5879c10c31 (patch) | |
| tree | 65922fdc968b359fa73cce0a1ae1aa2cef3a18eb /src | |
| parent | b120c819dbd15b23cf5392a5d5bdd8d8af18ead0 (diff) | |
| download | zig-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 'src')
| -rw-r--r-- | src/clang_options_data.zig | 11 | ||||
| -rw-r--r-- | src/main.zig | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/clang_options_data.zig b/src/clang_options_data.zig index 469b8fbded..995ef353fa 100644 --- a/src/clang_options_data.zig +++ b/src/clang_options_data.zig @@ -2480,14 +2480,7 @@ flagpd1("dwarf-ext-refs"), }, sepd1("dylib_file"), flagpd1("dylinker"), -.{ - .name = "dynamic", - .syntax = .flag, - .zig_equivalent = .dynamic, - .pd1 = true, - .pd2 = false, - .psl = false, -}, +flagpd1("dynamic"), .{ .name = "dynamiclib", .syntax = .flag, @@ -5041,7 +5034,7 @@ sepd1("stack-usage-file"), .{ .name = "static", .syntax = .flag, - .zig_equivalent = .static, + .zig_equivalent = .other, .pd1 = true, .pd2 = true, .psl = false, diff --git a/src/main.zig b/src/main.zig index 0f08109e9b..2885cdba95 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1653,8 +1653,6 @@ fn buildOutputType( }; } }, - .dynamic => link_mode = .Dynamic, - .static => link_mode = .Static, } } // Parse linker args. @@ -4687,8 +4685,6 @@ pub const ClangArgIterator = struct { weak_framework, headerpad_max_install_names, compress_debug_sections, - dynamic, - static, }; const Args = struct { |