diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2021-06-25 07:51:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-25 07:51:21 +0200 |
| commit | 350ead9cb2ce87485569fbf630f2906864f35a6b (patch) | |
| tree | 8c0f8fe31061a60db637ffc9120f800a0379beb1 /src/main.zig | |
| parent | 8216ce67895f5605d1720df4e5e6636395f2fc92 (diff) | |
| parent | ddd2cd73307c06906a8d120b41fd5ab8864797a1 (diff) | |
| download | zig-350ead9cb2ce87485569fbf630f2906864f35a6b.tar.gz zig-350ead9cb2ce87485569fbf630f2906864f35a6b.zip | |
Merge pull request #9229 from ziglang/zld-objc-frameworks
zig ld: link Obj-C, link frameworks, improve linker's implementation
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.zig b/src/main.zig index f2d00c47bb..1cf62c011b 100644 --- a/src/main.zig +++ b/src/main.zig @@ -290,6 +290,7 @@ const usage_build_generic = \\ .c C source code (requires LLVM extensions) \\ .cpp C++ source code (requires LLVM extensions) \\ Other C++ extensions: .C .cc .cxx + \\ .m Objective-C source code (requires LLVM extensions) \\ \\General Options: \\ -h, --help Print this help and exit @@ -1072,7 +1073,7 @@ fn buildOutputType( .object, .static_library, .shared_library => { try link_objects.append(arg); }, - .assembly, .c, .cpp, .h, .ll, .bc => { + .assembly, .c, .cpp, .h, .ll, .bc, .m => { try c_source_files.append(.{ .src_path = arg, .extra_flags = try arena.dupe([]const u8, extra_cflags.items), @@ -1135,7 +1136,7 @@ fn buildOutputType( .positional => { const file_ext = Compilation.classifyFileExt(mem.spanZ(it.only_arg)); switch (file_ext) { - .assembly, .c, .cpp, .ll, .bc, .h => try c_source_files.append(.{ .src_path = it.only_arg }), + .assembly, .c, .cpp, .ll, .bc, .h, .m => try c_source_files.append(.{ .src_path = it.only_arg }), .unknown, .shared_library, .object, .static_library => { try link_objects.append(it.only_arg); }, |