Merge branch 'jedisct1-tbd-dylib'

closes #6681
This commit is contained in:
Andrew Kelley 2020-10-14 18:24:21 -07:00
commit aa5ff867a2
2 changed files with 3 additions and 1 deletions

View File

@ -2012,7 +2012,8 @@ pub fn hasAsmExt(filename: []const u8) bool {
pub fn hasSharedLibraryExt(filename: []const u8) bool { pub fn hasSharedLibraryExt(filename: []const u8) bool {
if (mem.endsWith(u8, filename, ".so") or if (mem.endsWith(u8, filename, ".so") or
mem.endsWith(u8, filename, ".dll") 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; return true;
} }

View File

@ -221,6 +221,7 @@ const usage_build_generic =
\\ .so ELF shared object (dynamic link) \\ .so ELF shared object (dynamic link)
\\ .dll Windows Dynamic Link Library \\ .dll Windows Dynamic Link Library
\\ .dylib MACH-O (macOS) dynamic library \\ .dylib MACH-O (macOS) dynamic library
\\ .tbd (macOS) text-based dylib definition
\\ .s Target-specific assembly source code \\ .s Target-specific assembly source code
\\ .S Assembly with C preprocessor (requires LLVM extensions) \\ .S Assembly with C preprocessor (requires LLVM extensions)
\\ .c C source code (requires LLVM extensions) \\ .c C source code (requires LLVM extensions)