From 9422e27f97472fef924654f2906d04cfc412ad26 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 13 Jan 2022 08:52:42 +0100 Subject: [PATCH] Update curl to avoid setting `MACOSX_DEPLOYMENT_TARGET` on server --- Cargo.lock | 8 ++++---- README.md | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c3174d68d40d..862890a3387e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1326,9 +1326,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.38" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" +checksum = "7de97b894edd5b5bcceef8b78d7da9b75b1d2f2f9a910569d0bde3dd31d84939" dependencies = [ "curl-sys", "libc", @@ -1341,9 +1341,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.44+curl-7.77.0" +version = "0.4.52+curl-7.81.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1" +checksum = "14b8c2d1023ea5fded5b7b892e4b8e95f70038a421126a056761a84246a28971" dependencies = [ "cc", "libc", diff --git a/README.md b/README.md index da6bd2f4d38d7..c380115100ef9 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,6 @@ Welcome to Zed, a lightning-fast, collaborative code editor that makes your drea ## Development tips -### Compiling on macOS Monterey - -The Zed server uses libcurl, which currently triggers [a bug](https://github.com/rust-lang/rust/issues/90342) in `rustc`. To work around this bug, export the following environment variable: - -``` -export MACOSX_DEPLOYMENT_TARGET=10.7 -``` - ### Testing against locally-running servers Make sure you have `zed.dev` cloned as a sibling to this repo.