authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-14 18:24:21-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-14 18:24:21-07:00
logaa5ff867a2128249500a6757e48b6b2a0282caae
tree456c833f28c8b6c26ea609c6b6600420db6677da
parent477798b37ec034bacb4502b481597317d3950481
parent816304e7e14c911ec12b04e752885182169698ca

Merge branch 'jedisct1-tbd-dylib'

closes #6681

2 files changed, 3 insertions(+), 1 deletions(-)

src/Compilation.zig+2-1
......@@ -2012,7 +2012,8 @@ pub fn hasAsmExt(filename: []const u8) bool {
20122012pub fn hasSharedLibraryExt(filename: []const u8) bool {
20132013 if (mem.endsWith(u8, filename, ".so") or
20142014 mem.endsWith(u8, filename, ".dll") or
2015 mem.endsWith(u8, filename, ".dylib"))
2015 mem.endsWith(u8, filename, ".dylib") or
2016 mem.endsWith(u8, filename, ".tbd"))
20162017 {
20172018 return true;
20182019 }
src/main.zig+1
......@@ -221,6 +221,7 @@ const usage_build_generic =
221221 \\ .so ELF shared object (dynamic link)
222222 \\ .dll Windows Dynamic Link Library
223223 \\ .dylib MACH-O (macOS) dynamic library
224 \\ .tbd (macOS) text-based dylib definition
224225 \\ .s Target-specific assembly source code
225226 \\ .S Assembly with C preprocessor (requires LLVM extensions)
226227 \\ .c C source code (requires LLVM extensions)