From 2c76917d59fc0543047e759a50ac37277ddc4d6d Mon Sep 17 00:00:00 2001 From: carrascomj Date: Fri, 20 Oct 2023 18:30:10 +0200 Subject: [PATCH] fix: replace zld to lld for macos --- .cargo/config.toml | 16 ++++++++++++---- Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index ecff3ba..e297d46 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -7,13 +7,21 @@ linker = "clang" rustflags = ["-Clink-arg=-fuse-ld=lld", "-Zshare-generics=y"] -# NOTE: you must manually install https://github.com/michaeleisel/zld on mac. you can easily do this with the "brew" package manager: -# `brew install michaeleisel/zld/zld` +# NOTE: you must install [Mach-O LLD Port](https://lld.llvm.org/MachO/index.html) on mac. you can easily do this by installing llvm which includes lld with the "brew" package manager: +# `brew install llvm` [target.x86_64-apple-darwin] -rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld", "-Zshare-generics=y"] +rustflags = [ + "-C", + "link-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld", + "-Zshare-generics=y", +] [target.aarch64-apple-darwin] -rustflags = ["-C", "link-arg=-fuse-ld=/opt/homebrew/bin/zld", "-Zshare-generics=y"] +rustflags = [ + "-C", + "link-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld", + "-Zshare-generics=y", +] [target.x86_64-pc-windows-msvc] linker = "rust-lld.exe" diff --git a/Cargo.lock b/Cargo.lock index 7322864..70415bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2892,7 +2892,7 @@ dependencies = [ [[package]] name = "shu" -version = "0.7.0" +version = "0.7.1" dependencies = [ "async-std", "bevy", diff --git a/Cargo.toml b/Cargo.toml index 6903aa3..25fc261 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shu" -version = "0.7.0" +version = "0.7.1" edition = "2021" license = "MIT OR Apache-2.0" description = "High-dimensional metabolic maps."