]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #65920 - smaeul:patch/workspace-hack, r=alexcrichton
authorTyler Mandry <tmandry@gmail.com>
Tue, 29 Oct 2019 19:01:46 +0000 (12:01 -0700)
committerGitHub <noreply@github.com>
Tue, 29 Oct 2019 19:01:46 +0000 (12:01 -0700)
Use rustc-workspace-hack for rustbook

As rustbook now depends transitively on openssl, it needs access to the
rustc-workspace-hack/all-static feature to pick up openssl-sys/vendored.
This fixes the rust build with `all-static = true` on systems where
openssl is not installed (e.g. when cross-compiling).

1  2 
Cargo.lock

diff --cc Cargo.lock
Simple merge