Skip to content

Commit

Permalink
Merge branch 'main' into ghdtjgus76/move-react-dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonyshew authored May 20, 2024
2 parents 3f74de8 + a4ad586 commit 1c93512
Show file tree
Hide file tree
Showing 50 changed files with 1,208 additions and 2,885 deletions.
13 changes: 10 additions & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@ rustdocflags = ["-Znormalize-docs"]
[target.x86_64-pc-windows-msvc]
linker = "rust-lld"

[target.aarch64-apple-darwin]
[target.'cfg(target_os = "macos")']
linker = "rust-lld"

[target.x86_64-apple-darwin]
linker = "rust-lld"
[target.'cfg(all(target_os = "linux", target_env = "gnu"))']
rustflags = [
"--cfg",
"tokio_unstable",
"-Zshare-generics=y",
"-Zthreads=8",
"-Csymbol-mangling-version=v0",
"-Clink-arg=-fuse-ld=lld",
]

[alias]
xtask = "run --package xtask --"
Expand Down
5 changes: 5 additions & 0 deletions .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ runs:
# we want more specific settings
cache: false

- name: "Install LLD (LLVM Linker) for Linux"
if: runner.os == 'Linux'
shell: bash
run: sudo apt-get -y update && sudo apt-get install -y lld

- name: "Set Windows default host to MinGW"
if: ${{ inputs.windows == 'true' }}
shell: bash
Expand Down
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ Thanks for your interest in contributing to Turbo!
- [Rust](https://www.rust-lang.org/tools/install)
- [cargo-groups](https://github.com/nicholaslyang/cargo-groups) (used to group crates into Turborepo-specific ones and Turbopack-specific ones)

### Linux Dependencies

- LLD (LLVM Linker), as it's not installed by default on many Linux distributions (e.g. `apt install lld`).

## Contributing to Turborepo

### Building Turborepo
Expand Down
Loading

0 comments on commit 1c93512

Please sign in to comment.