From 96443b234eecf3c8d95c5fc29a37915e8ca73383 Mon Sep 17 00:00:00 2001 From: Bugen Zhao Date: Mon, 4 Mar 2024 16:08:13 +0800 Subject: [PATCH] chore: use system linker in macOS Signed-off-by: Bugen Zhao --- .cargo/config.toml | 4 +--- docs/developer-guide.md | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index fbe29b3e6b6af..7af9e83911cf1 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -19,14 +19,12 @@ 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", + "-Ctarget-feature=+sse4.2", # use a generally available feature, since it's not for production ] [target.aarch64-apple-darwin] rustflags = [ # neon is enabled by default - "-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld", ] # Flags for all targets. diff --git a/docs/developer-guide.md b/docs/developer-guide.md index 8cf5dcd4ebbaa..359bb559c180f 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -80,7 +80,7 @@ RiseDev is the development mode of RisingWave. To develop RisingWave, you need t To install the dependencies on macOS, run: ```shell -brew install postgresql cmake protobuf tmux cyrus-sasl llvm +brew install postgresql cmake protobuf tmux cyrus-sasl curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh ``` @@ -566,4 +566,4 @@ Instructions about submitting PRs are included in the [contribution guidelines]( These correspond to its `depends` field in `pull-request.yml` and `main-cron.yml` . 2. Add `ci/run-e2e-test` to run the step as well. 3. Add `ci/run-main-cron` to run `main-cron` workflow in your pull request, - 4. Add `ci/main-cron/skip-ci` to skip all other steps which were not selected with `ci/run-xxx`. \ No newline at end of file + 4. Add `ci/main-cron/skip-ci` to skip all other steps which were not selected with `ci/run-xxx`.