diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2019-10-29 12:01:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 12:01:46 -0700 |
| commit | 4359666daa6dea916ed1e9700ae8cccaf2f46e2f (patch) | |
| tree | 312dac74d5c8049c370abeb8cb9b70132f4297bc | |
| parent | 67558a890e06603914a91a5d4c75269b6d873bae (diff) | |
| parent | c648ad587c7b133b2e95cc370b8b5e813c352fb1 (diff) | |
| download | rust-4359666daa6dea916ed1e9700ae8cccaf2f46e2f.tar.gz rust-4359666daa6dea916ed1e9700ae8cccaf2f46e2f.zip | |
Rollup merge of #65920 - smaeul:patch/workspace-hack, r=alexcrichton
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).
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/bootstrap/tool.rs | 1 | ||||
| -rw-r--r-- | src/tools/rustbook/Cargo.toml | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock index 64bcf312b36..5826a1dbbd9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3103,6 +3103,7 @@ dependencies = [ "failure", "mdbook", "mdbook-linkcheck", + "rustc-workspace-hack", ] [[package]] diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index f1baeafe26a..815498047fd 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -244,6 +244,7 @@ pub fn prepare_tool_cargo( path.ends_with("rls") || path.ends_with("clippy") || path.ends_with("miri") || + path.ends_with("rustbook") || path.ends_with("rustfmt") { cargo.env("LIBZ_SYS_STATIC", "1"); diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml index a7188f0d11e..89bbde4d5a9 100644 --- a/src/tools/rustbook/Cargo.toml +++ b/src/tools/rustbook/Cargo.toml @@ -13,6 +13,11 @@ clap = "2.25.0" failure = "0.1" mdbook-linkcheck = { version = "0.3.0", optional = true } +# A noop dependency that changes in the Rust repository, it's a bit of a hack. +# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust` +# for more information. +rustc-workspace-hack = "1.0.0" + [dependencies.mdbook] version = "0.3.0" default-features = false |