diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-02-21 14:19:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 14:19:20 -0500 |
| commit | 10e0b071354d8a1b4ab70041dfdd06a008bd6d3d (patch) | |
| tree | a705cb0f0e25fceb5263e10fc027011e0ee26f76 /src/glibc.cpp | |
| parent | e381a42de9c0f0c5439a926b0ac99026a0373f49 (diff) | |
| parent | 71573584cdfb1ddb176681fcb7d1544cac7a72ca (diff) | |
| download | zig-10e0b071354d8a1b4ab70041dfdd06a008bd6d3d.tar.gz zig-10e0b071354d8a1b4ab70041dfdd06a008bd6d3d.zip | |
Merge pull request #4509 from ziglang/sub-architecture-annihilation
sub-architecture annihilation
Diffstat (limited to 'src/glibc.cpp')
| -rw-r--r-- | src/glibc.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/glibc.cpp b/src/glibc.cpp index ec45b6afa7..849aac6c77 100644 --- a/src/glibc.cpp +++ b/src/glibc.cpp @@ -116,10 +116,8 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo assert(opt_abi.is_some); - err = target_parse_archsub(&target->arch, &target->sub_arch, - (char*)opt_arch.value.ptr, opt_arch.value.len); - // there's no sub arch so we might get an error, but the arch is still populated - assert(err == ErrorNone || err == ErrorUnknownArchitecture); + err = target_parse_arch(&target->arch, (char*)opt_arch.value.ptr, opt_arch.value.len); + assert(err == ErrorNone); target->os = OsLinux; |