From 463b891aa5589bd948f33b46eebdb0368507d094 Mon Sep 17 00:00:00 2001 From: StrikeW Date: Wed, 9 Oct 2024 20:12:40 +0800 Subject: [PATCH] Reapply "build(mac): brew install llvm -> lld (#18804)" This reverts commit 8457c8899ee6ae84758070293e845ee67d9fac05. --- .cargo/config.toml | 4 ++-- docs/dev/src/build-and-run/intro.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 52565a593c056..1dfbe381a5563 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -20,13 +20,13 @@ rustflags = [ [target.x86_64-apple-darwin] rustflags = [ "-Ctarget-feature=+sse4.2", # use a generally available feature, since it's not for production - "-Clink-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld", + "-Clink-arg=-fuse-ld=lld", ] [target.aarch64-apple-darwin] rustflags = [ # neon is enabled by default - "-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld", + "-Clink-arg=-fuse-ld=lld", ] # Flags for all targets. diff --git a/docs/dev/src/build-and-run/intro.md b/docs/dev/src/build-and-run/intro.md index 94caeb076a056..0e3c44a7a5bec 100644 --- a/docs/dev/src/build-and-run/intro.md +++ b/docs/dev/src/build-and-run/intro.md @@ -7,7 +7,7 @@ To install the dependencies on macOS, run: ```shell -brew install postgresql cmake protobuf tmux cyrus-sasl llvm openssl@3 +brew install postgresql cmake protobuf tmux cyrus-sasl lld openssl@3 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh ```