From 3d2ab4e58c6b05b750a074d279c2b3050ec24ad2 Mon Sep 17 00:00:00 2001 From: Stanislav Alekseev <43210583+WeetHet@users.noreply.github.com> Date: Sat, 17 May 2025 08:20:23 +0300 Subject: [PATCH] build: Remove -all_load linker argument on macOS (#30656) This fixes builds in nix development shell on macOS Release Notes: - N/A --- .cargo/config.toml | 6 ------ flake.lock | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index ae3d157346..717c5e18c8 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -13,12 +13,6 @@ rustflags = ["-C", "link-arg=-fuse-ld=mold"] linker = "clang" rustflags = ["-C", "link-arg=-fuse-ld=mold"] -[target.aarch64-apple-darwin] -rustflags = ["-C", "link-args=-all_load"] - -[target.x86_64-apple-darwin] -rustflags = ["-C", "link-args=-all_load"] - [target.'cfg(target_os = "windows")'] rustflags = [ "--cfg", diff --git a/flake.lock b/flake.lock index cb96136c42..1ee46bcdcd 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1743906877, - "narHash": "sha256-Thah1oU8Vy0gs9bh5QhNcQh1iuQiowMnZPbrkURonZA=", + "lastModified": 1747363019, + "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9d00c6b69408dd40d067603012938d9fbe95cfcd", + "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f", "type": "github" }, "original": {