Merge pull request #2526 from LemonBoy/arch-format-osx

Build archives using the K_DARWIN format when targeting osx

1 files changed, 2 insertions, 10 deletions

diff --git a/build.zig b/build.zig
index 82949ad5bc..13ac983e12 100644
--- a/build.zig
+++ b/build.zig
@@ -383,17 +383,9 @@ const Context = struct {
 };
 
 fn addLibUserlandStep(b: *Builder) void {
-    // Sadly macOS requires hacks to work around the buggy MACH-O linker code.
-    const artifact = if (builtin.os == .macosx)
-        b.addObject("userland", "src-self-hosted/stage1.zig")
-    else
-        b.addStaticLibrary("userland", "src-self-hosted/stage1.zig");
+    const artifact = b.addStaticLibrary("userland", "src-self-hosted/stage1.zig");
     artifact.disable_gen_h = true;
-    if (builtin.os == .macosx) {
-        artifact.disable_stack_probing = true;
-    } else {
-        artifact.bundle_compiler_rt = true;
-    }
+    artifact.bundle_compiler_rt = true;
     artifact.setTarget(builtin.arch, builtin.os, builtin.abi);
     artifact.linkSystemLibrary("c");
     const libuserland_step = b.step("libuserland", "Build the userland compiler library for use in stage1");