zig

commit aa5ff867a2128249500a6757e48b6b2a0282caae (tree)
parent 477798b37ec034bacb4502b481597317d3950481
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 14 Oct 2020 18:24:21 -0700

Merge branch 'jedisct1-tbd-dylib'

closes #6681

Diffstat:
M
src/Compilation.zig
 | 
3
++-
M
src/main.zig
 | 
1
+

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -2012,7 +2012,8 @@ pub fn hasAsmExt(filename: []const u8) bool {
 pub fn hasSharedLibraryExt(filename: []const u8) bool {
     if (mem.endsWith(u8, filename, ".so") or
         mem.endsWith(u8, filename, ".dll") or
-        mem.endsWith(u8, filename, ".dylib"))
+        mem.endsWith(u8, filename, ".dylib") or
+        mem.endsWith(u8, filename, ".tbd"))
     {
         return true;
     }
diff --git a/src/main.zig b/src/main.zig
@@ -221,6 +221,7 @@ const usage_build_generic =
     \\                     .so    ELF shared object (dynamic link)
     \\                    .dll    Windows Dynamic Link Library
     \\                  .dylib    MACH-O (macOS) dynamic library
+    \\                    .tbd    (macOS) text-based dylib definition
     \\                      .s    Target-specific assembly source code
     \\                      .S    Assembly with C preprocessor (requires LLVM extensions)
     \\                      .c    C source code (requires LLVM extensions)