| author |  Andrew Kelley <andrew@ziglang.org> 2020-10-14 18:24:21-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-10-14 18:24:21-07:00 |
| log | aa5ff867a2128249500a6757e48b6b2a0282caae |
| tree | 456c833f28c8b6c26ea609c6b6600420db6677da |
| parent | 477798b37ec034bacb4502b481597317d3950481 |
| parent | 816304e7e14c911ec12b04e752885182169698ca |
Merge branch 'jedisct1-tbd-dylib'
closes #66812 files changed, 3 insertions(+), 1 deletions(-)
src/Compilation.zig+2-1
| ... | @@ -2012,7 +2012,8 @@ pub fn hasAsmExt(filename: []const u8) bool { | ... | @@ -2012,7 +2012,8 @@ pub fn hasAsmExt(filename: []const u8) bool { |
| 2012 | pub fn hasSharedLibraryExt(filename: []const u8) bool { | 2012 | pub fn hasSharedLibraryExt(filename: []const u8) bool { |
| 2013 | if (mem.endsWith(u8, filename, ".so") or | 2013 | if (mem.endsWith(u8, filename, ".so") or |
| 2014 | mem.endsWith(u8, filename, ".dll") or | 2014 | 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")) | ||
| 2016 | { | 2017 | { |
| 2017 | return true; | 2018 | return true; |
| 2018 | } | 2019 | } |
src/main.zig+1
| ... | @@ -221,6 +221,7 @@ const usage_build_generic = | ... | @@ -221,6 +221,7 @@ const usage_build_generic = |
| 221 | \\ .so ELF shared object (dynamic link) | 221 | \\ .so ELF shared object (dynamic link) |
| 222 | \\ .dll Windows Dynamic Link Library | 222 | \\ .dll Windows Dynamic Link Library |
| 223 | \\ .dylib MACH-O (macOS) dynamic library | 223 | \\ .dylib MACH-O (macOS) dynamic library |
| 224 | \\ .tbd (macOS) text-based dylib definition | ||
| 224 | \\ .s Target-specific assembly source code | 225 | \\ .s Target-specific assembly source code |
| 225 | \\ .S Assembly with C preprocessor (requires LLVM extensions) | 226 | \\ .S Assembly with C preprocessor (requires LLVM extensions) |
| 226 | \\ .c C source code (requires LLVM extensions) | 227 | \\ .c C source code (requires LLVM extensions) |