zig

commit eba153f88f0bdb36a654bd2cb794d2ead9d4e398 (tree)
parent dae4c18aa7999a866b6b145ed3c88cb6c06852be
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Mon,  2 Aug 2021 08:01:15 +0200

Merge pull request #9501 from ziglang/macho-objc-cleanup

Add standalone Objective-C enabled on macOS only
Diffstat:
M
src/link/MachO.zig
 | 
1
+
M
test/standalone.zig
 | 
4
++++
A
test/standalone/objc/Foo.h
 | 
7
+++++++
A
test/standalone/objc/Foo.m
 | 
11
+++++++++++
A
test/standalone/objc/build.zig
 | 
22
++++++++++++++++++++++
A
test/standalone/objc/test.m
 | 
12
++++++++++++

6 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
@@ -1471,6 +1471,7 @@ fn sortSections(self: *MachO) !void {
             &self.cstring_section_index,
             &self.ustring_section_index,
             &self.text_const_section_index,
+            &self.objc_methlist_section_index,
             &self.objc_methname_section_index,
             &self.objc_methtype_section_index,
             &self.objc_classname_section_index,
diff --git a/test/standalone.zig b/test/standalone.zig
@@ -37,6 +37,10 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
     if (std.Target.current.os.tag == .linux) {
         cases.addBuildFile("test/standalone/pie/build.zig", .{});
     }
+    // Try to build and run an Objective-C executable.
+    if (std.Target.current.os.tag == .macos) {
+        cases.addBuildFile("test/standalone/objc/build.zig", .{ .build_modes = true });
+    }
 
     // Ensure the development tools are buildable.
     cases.add("tools/gen_spirv_spec.zig");
diff --git a/test/standalone/objc/Foo.h b/test/standalone/objc/Foo.h
@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+@interface Foo : NSObject
+
+- (NSString *)name;
+
+@end
diff --git a/test/standalone/objc/Foo.m b/test/standalone/objc/Foo.m
@@ -0,0 +1,11 @@
+#import "Foo.h"
+
+@implementation Foo
+
+- (NSString *)name
+{
+      NSString *str = [[NSString alloc] initWithFormat:@"Zig"];
+      return str;
+}
+
+@end
diff --git a/test/standalone/objc/build.zig b/test/standalone/objc/build.zig
@@ -0,0 +1,22 @@
+const std = @import("std");
+const Builder = std.build.Builder;
+
+pub fn build(b: *Builder) void {
+    const mode = b.standardReleaseOptions();
+    const target = b.standardTargetOptions(.{});
+
+    const test_step = b.step("test", "Test the program");
+
+    const exe = b.addExecutable("test", null);
+    b.default_step.dependOn(&exe.step);
+    exe.addIncludeDir(".");
+    exe.addCSourceFile("Foo.m", &[0][]const u8{});
+    exe.addCSourceFile("test.m", &[0][]const u8{});
+    exe.setBuildMode(mode);
+    exe.setTarget(target);
+    exe.linkLibC();
+    exe.linkFramework("Foundation");
+
+    const run_cmd = exe.run();
+    test_step.dependOn(&run_cmd.step);
+}
diff --git a/test/standalone/objc/test.m b/test/standalone/objc/test.m
@@ -0,0 +1,12 @@
+#import "Foo.h"
+#import <assert.h>
+
+int main(int argc, char *argv[])
+{
+  @autoreleasepool {
+      Foo *foo = [[Foo alloc] init];
+      NSString *result = [foo name];
+      assert([result isEqualToString:@"Zig"]);
+      return 0;
+  }
+}