From: bors <bors@rust-lang.org>
Date: Mon, 21 Nov 2016 21:18:02 +0000 (-0600)
Subject: Auto merge of #3311 - alexcrichton:fix-nightlies, r=brson
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~116
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f003b0ec57734150c38105a09d86e6529fdf7176;p=cargo.git

Auto merge of #3311 - alexcrichton:fix-nightlies, r=brson

Link OpenSSL statically on OSX

Now that Cargo requires OpenSSL >= 1.0.1 transitively through the `openssl-sys`
0.9 release the dynamic libraries for OpenSSL are no longer located on OSX by
default. This means that the support necessary for libssh2 needs to be
statically linked rather than dynamically linked.

Closes #3303
---

f003b0ec57734150c38105a09d86e6529fdf7176