From fe40c9e36404030f043396c02c3e21bba19834b5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 13 Jun 2024 15:29:05 -0500
Subject: [PATCH] nix: use `-ld_new` on macOS devshell

The new parallel macOS linker reduces link time for the debug `jj` binary from
3s to 0.7s on my M2 Macbook Air, which is a significant reduction for nearly
no cost at all. This only assumes that you have a new enough Xcode environment
as your default (where `/usr/bin/ld` resides.)

This change requires Sonoma and Xcode 15, but in theory I think we could target
a lower macOS SDK version in order to produce binaries that are more backwards
compatible, so the only real cost is that developers who also use Nix would
require Sonoma.
---
 flake.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index bbafd1cde..22be80679 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,16 +54,25 @@
         export DYLD_FALLBACK_LIBRARY_PATH=$(${ourRustVersion}/bin/rustc --print sysroot)/lib
       '';
       
-      # NOTE (aseipp): on Linux, go ahead and use mold by default to improve
-      # link times a bit; mostly useful for debug build speed, but will help
-      # over time if we ever get more dependencies, too
-      useMoldLinker = pkgs.stdenv.isLinux;
-
       # these are needed in both devShell and buildInputs
       linuxNativeDeps = with pkgs; lib.optionals stdenv.isLinux [
         mold-wrapped
       ];
 
+      # on macOS and Linux, use faster parallel linkers that are much more
+      # efficient than the defaults. these noticeably improve link time even for
+      # medium sized rust projects like jj
+      rustLinkerFlags =
+        if pkgs.stdenv.isLinux then
+          [ "-fuse-ld=mold" "-Wl,--compress-debug-sections=zstd" ]
+        else if pkgs.stdenv.isDarwin then
+          [ "-fuse-ld=/usr/bin/ld" "-ld_new" ]
+        else
+          [ ];
+
+      rustLinkFlagsString = pkgs.lib.concatStringsSep " " (pkgs.lib.concatMap (x:
+        [ "-C" "link-arg=${x}" ]
+      ) rustLinkerFlags);
     in
     {
       packages = {
@@ -98,7 +107,7 @@
 
           ZSTD_SYS_USE_PKG_CONFIG = "1";
           LIBSSH2_SYS_USE_PKG_CONFIG = "1";
-          RUSTFLAGS = pkgs.lib.optionalString useMoldLinker "-C link-arg=-fuse-ld=mold";
+          RUSTFLAGS = pkgs.lib.optionalString pkgs.stdenv.isLinux "-C link-arg=-fuse-ld=mold";
           NIX_JJ_GIT_HASH = self.rev or "";
           CARGO_INCREMENTAL = "0";
 
@@ -175,9 +184,7 @@
           export ZSTD_SYS_USE_PKG_CONFIG=1
           export LIBSSH2_SYS_USE_PKG_CONFIG=1
 
-          export RUSTFLAGS="-Zthreads=0"
-        '' + pkgs.lib.optionalString useMoldLinker ''
-          export RUSTFLAGS+=" -C link-arg=-fuse-ld=mold -C link-arg=-Wl,--compress-debug-sections=zstd"
+          export RUSTFLAGS="-Zthreads=0 ${rustLinkFlagsString}"
         '' + darwinNextestHack;
       };
     }));