zig

commit 15d5cab569a5ffc6495d606f460264429043aabf (tree)
parent 91ecce3bc05abb6677b389cbc7af403584d9cc7d
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue, 21 Jan 2020 12:25:22 -0500

fix target_triple_zig to emit zig-compatible triples

Diffstat:
M
src/target.cpp
 | 
11
++++-------

1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/target.cpp b/src/target.cpp
@@ -831,14 +831,11 @@ void init_all_targets(void) {
 
 void target_triple_zig(Buf *triple, const ZigTarget *target) {
     buf_resize(triple, 0);
-    const char *abi_name = target->abi == ZigLLVM_UnknownEnvironment ?
-        "none" : ZigLLVMGetEnvironmentTypeName(target->abi);
-
     buf_appendf(triple, "%s%s-%s-%s",
-            ZigLLVMGetArchTypeName(target->arch),
-            ZigLLVMGetSubArchTypeName(target->sub_arch),
-            ZigLLVMGetOSTypeName(get_llvm_os_type(target->os)),
-            abi_name);
+            target_arch_name(target->arch),
+            target_subarch_name(target->sub_arch),
+            target_os_name(target->os),
+            target_abi_name(target->abi));
 }
 
 void target_triple_llvm(Buf *triple, const ZigTarget *target) {