Skip to content

Commit 934bc61

Browse files
committed
Auto merge of #10106 - russweas:master, r=ehuss
Update curl dependency, remove M1 macOS build error note Curl subversion 41 includes a workaround for the m1 macOS build error. See rust-lang/rust#90342 (comment)
2 parents fa107dd + 22ff7ac commit 934bc61

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
2222
cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
2323
crates-io = { path = "crates/crates-io", version = "0.33.0" }
2424
crossbeam-utils = "0.8"
25-
curl = { version = "0.4.40", features = ["http2"] }
25+
curl = { version = "0.4.41", features = ["http2"] }
2626
curl-sys = "0.4.50"
2727
env_logger = "0.9.0"
2828
pretty_env_logger = { version = "0.4", optional = true }

src/doc/contrib/src/process/working-on-cargo.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ If you can successfully run `cargo build`, you should be good to go!
4646

4747
[homebrew]: https://brew.sh/
4848

49-
Note: There is currently a bug on arm64 M1 macOS machines that will cause an error
50-
while linking cargo. To fix this, run `export MACOSX_DEPLOYMENT_TARGET=10.7` before
51-
attempting to build the cargo project. For more information, see
52-
[rust#90342](https://github.com/rust-lang/rust/issues/90342).
53-
5449
## Running Cargo
5550

5651
You can use `cargo run` to run cargo itself, or you can use the path directly

0 commit comments

Comments
 (0)