diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-10-14 18:24:21 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-10-14 18:24:21 -0700 |
| commit | aa5ff867a2128249500a6757e48b6b2a0282caae (patch) | |
| tree | 456c833f28c8b6c26ea609c6b6600420db6677da | |
| parent | 477798b37ec034bacb4502b481597317d3950481 (diff) | |
| parent | 816304e7e14c911ec12b04e752885182169698ca (diff) | |
| download | zig-aa5ff867a2128249500a6757e48b6b2a0282caae.tar.gz zig-aa5ff867a2128249500a6757e48b6b2a0282caae.zip | |
Merge branch 'jedisct1-tbd-dylib'
closes #6681
| -rw-r--r-- | src/Compilation.zig | 3 | ||||
| -rw-r--r-- | src/main.zig | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 1fddda42f9..1b32a80279 100644 --- 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 index 58f8c0be44..ff3ef7c1c3 100644 --- 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) |