From 22ff7ac47c0e3a366637643c9cf38c61d649c10b Mon Sep 17 00:00:00 2001 From: Russ Weas Date: Sat, 20 Nov 2021 22:04:58 -0600 Subject: [PATCH] Update curl dependency, remove M1 macOS build error note --- Cargo.toml | 2 +- src/doc/contrib/src/process/working-on-cargo.md | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4c8937cc22c..e23f4ec066e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } cargo-util = { path = "crates/cargo-util", version = "0.1.1" } crates-io = { path = "crates/crates-io", version = "0.33.0" } crossbeam-utils = "0.8" -curl = { version = "0.4.40", features = ["http2"] } +curl = { version = "0.4.41", features = ["http2"] } curl-sys = "0.4.50" env_logger = "0.9.0" pretty_env_logger = { version = "0.4", optional = true } diff --git a/src/doc/contrib/src/process/working-on-cargo.md b/src/doc/contrib/src/process/working-on-cargo.md index 7552f6dc7c1..b2e002bc464 100644 --- a/src/doc/contrib/src/process/working-on-cargo.md +++ b/src/doc/contrib/src/process/working-on-cargo.md @@ -46,11 +46,6 @@ If you can successfully run `cargo build`, you should be good to go! [homebrew]: https://brew.sh/ -Note: There is currently a bug on arm64 M1 macOS machines that will cause an error -while linking cargo. To fix this, run `export MACOSX_DEPLOYMENT_TARGET=10.7` before -attempting to build the cargo project. For more information, see -[rust#90342](https://github.com/rust-lang/rust/issues/90342). - ## Running Cargo You can use `cargo run` to run cargo itself, or you can use the path directly