| author |  Andrew Kelley <andrew@ziglang.org> 2023-01-09 15:12:10-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2023-01-09 15:12:10-07:00 |
| log | 55be10486ef6aad1f497fb0ab85ac36043b79652 |
| tree | 9d2efe301dbfa14a43608a8adbc87d5027eb8e70 |
| parent | 5766c8ebc8c1ebf32383bb338328154035f0f4d7 |
fix merge conflict with identifiers matching primitives
2 files changed, 3 insertions(+), 3 deletions(-)
src/clang_options_data.zig+1-1
| ... | @@ -6336,7 +6336,7 @@ joinpd1("sycl-std="), | ... | @@ -6336,7 +6336,7 @@ joinpd1("sycl-std="), |
| 6336 | .{ | 6336 | .{ |
| 6337 | .name = "undefined", | 6337 | .name = "undefined", |
| 6338 | .syntax = .joined_or_separate, | 6338 | .syntax = .joined_or_separate, |
| 6339 | .zig_equivalent = .undefined, | 6339 | .zig_equivalent = .@"undefined", |
| 6340 | .pd1 = true, | 6340 | .pd1 = true, |
| 6341 | .pd2 = false, | 6341 | .pd2 = false, |
| 6342 | .psl = false, | 6342 | .psl = false, |
src/main.zig+2-2
| ... | @@ -1661,7 +1661,7 @@ fn buildOutputType( | ... | @@ -1661,7 +1661,7 @@ fn buildOutputType( |
| 1661 | .install_name => { | 1661 | .install_name => { |
| 1662 | install_name = it.only_arg; | 1662 | install_name = it.only_arg; |
| 1663 | }, | 1663 | }, |
| 1664 | .undefined => { | 1664 | .@"undefined" => { |
| 1665 | if (mem.eql(u8, "dynamic_lookup", it.only_arg)) { | 1665 | if (mem.eql(u8, "dynamic_lookup", it.only_arg)) { |
| 1666 | linker_allow_shlib_undefined = true; | 1666 | linker_allow_shlib_undefined = true; |
| 1667 | } else { | 1667 | } else { |
| ... | @@ -4730,7 +4730,7 @@ pub const ClangArgIterator = struct { | ... | @@ -4730,7 +4730,7 @@ pub const ClangArgIterator = struct { |
| 4730 | headerpad_max_install_names, | 4730 | headerpad_max_install_names, |
| 4731 | compress_debug_sections, | 4731 | compress_debug_sections, |
| 4732 | install_name, | 4732 | install_name, |
| 4733 | undefined, | 4733 | @"undefined", |
| 4734 | }; | 4734 | }; |
| 4735 | 4735 | ||
| 4736 | const Args = struct { | 4736 | const Args = struct { |