diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-13 19:50:29 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-13 19:50:29 +0000 |
| commit | 619578304995fce4e99d8c42151fdb56d186ceeb (patch) | |
| tree | 650541fadf6687bda4190fa3f3da182715b7317d /xtask | |
| parent | 47865566575eb58cc107e7df9b71f227938a8e14 (diff) | |
| parent | 5e3c1c2b5f63e57f98a7d02f75a559d225341b1c (diff) | |
Merge #2231
2231: Allow usage of CARGO_TARGET_DIR env var r=matklad a=killercup
Co-authored-by: Pascal Hertleif <[email protected]>
Diffstat (limited to 'xtask')
| -rw-r--r-- | xtask/src/main.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 576ba003a..84842b428 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
| @@ -227,7 +227,8 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { | |||
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | fn install_server(opts: ServerOpt) -> Result<()> { | 229 | fn install_server(opts: ServerOpt) -> Result<()> { |
| 230 | let ac = autocfg::AutoCfg::with_dir("target")?; | 230 | let target_dir = env::var_os("CARGO_TARGET_DIR").unwrap_or_else(|| "target".into()); |
| 231 | let ac = autocfg::AutoCfg::with_dir(target_dir)?; | ||
| 231 | 232 | ||
| 232 | let old_rust = !ac.probe_rustc_version(REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1); | 233 | let old_rust = !ac.probe_rustc_version(REQUIRED_RUST_VERSION.0, REQUIRED_RUST_VERSION.1); |
| 233 | 234 | ||