Commit 9cb3ccd8 authored by Niklas Korz's avatar Niklas Korz Committed by Gaetan Lepage
Browse files

zed-editor: disable linker override on linux

(cherry picked from commit c8f52a6def729a54e13125dfaf0f51ebb48eca54)
parent c2befde1
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
diff --git a/.cargo/config.toml b/.cargo/config.toml
index 07cbc23195..b3c4d43e0f 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
 [alias]
 xtask = "run --package xtask --"
 
-[target.x86_64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
-
-[target.aarch64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
-
 [target.aarch64-apple-darwin]
 rustflags = ["-C", "link-args=-Objc -all_load"]
 
+6 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@
  livekit-libwebrtc,
  testers,
  writableTmpDirAsHomeHook,
  clang,

  withGLES ? false,
  buildRemoteServer ? true,
@@ -114,6 +113,12 @@ rustPlatform.buildRustPackage rec {
    # Until https://github.com/zed-industries/zed/issues/19971 is fixed,
    # we also skip any crate for which the license cannot be determined.
    ./0001-generate-licenses.patch

    # Upstream delegates linking on Linux to clang to make use of mold,
    # but builds fine with our standard linker.
    # This patch removes their linker override from the cargo config.
    ./0002-linux-linker.patch

    # See https://github.com/zed-industries/zed/pull/21661#issuecomment-2524161840
    "script/patches/use-cross-platform-livekit.patch"
  ];
@@ -129,7 +134,6 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs =
    [
      clang
      cmake
      copyDesktopItems
      curl