From: bors <bors@rust-lang.org>
Date: Tue, 16 May 2017 17:18:23 +0000 (+0000)
Subject: Auto merge of #41853 - Keruspe:install, r=alexcrichton
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=b28cf7564a1e7ed45855c2dbee744f76a191b052;hp=-c;p=rust.git

Auto merge of #41853 - Keruspe:install, r=alexcrichton

rustbuild: add support for --bindir and --sysconfdir

This depends on https://github.com/rust-lang/rust-installer/pull/59 and we'll need to udpate the rust-installer submodule once it gets merged for it to work

Fixes #41644
---

b28cf7564a1e7ed45855c2dbee744f76a191b052
diff --combined src/Cargo.lock
index 6d7b13f66f7,2b76dea6122..c9de8f99008
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@@ -345,7 -345,7 +345,7 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "lzma-sys"
- version = "0.1.3"
+ version = "0.1.4"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -405,14 -405,6 +405,14 @@@ name = "open
  version = "1.2.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
 +[[package]]
 +name = "owning_ref"
 +version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "panic_abort"
  version = "0.0.0"
@@@ -539,12 -531,12 +539,12 @@@ dependencies = 
   "fmt_macros 0.0.0",
   "graphviz 0.0.0",
   "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "rustc_back 0.0.0",
   "rustc_bitflags 0.0.0",
   "rustc_const_math 0.0.0",
   "rustc_data_structures 0.0.0",
   "rustc_errors 0.0.0",
 - "rustc_llvm 0.0.0",
   "serialize 0.0.0",
   "syntax 0.0.0",
   "syntax_pos 0.0.0",
@@@ -654,6 -646,7 +654,6 @@@ dependencies = 
   "rustc_errors 0.0.0",
   "rustc_incremental 0.0.0",
   "rustc_lint 0.0.0",
 - "rustc_llvm 0.0.0",
   "rustc_metadata 0.0.0",
   "rustc_mir 0.0.0",
   "rustc_passes 0.0.0",
@@@ -727,13 -720,13 +727,13 @@@ version = "0.0.0
  dependencies = [
   "flate 0.0.0",
   "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "proc_macro 0.0.0",
   "rustc 0.0.0",
   "rustc_back 0.0.0",
   "rustc_const_math 0.0.0",
   "rustc_data_structures 0.0.0",
   "rustc_errors 0.0.0",
 - "rustc_llvm 0.0.0",
   "serialize 0.0.0",
   "syntax 0.0.0",
   "syntax_ext 0.0.0",
@@@ -835,7 -828,6 +835,7 @@@ version = "0.0.0
  dependencies = [
   "flate 0.0.0",
   "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "rustc 0.0.0",
   "rustc_back 0.0.0",
   "rustc_bitflags 0.0.0",
@@@ -931,11 -923,6 +931,11 @@@ dependencies = 
  name = "serialize"
  version = "0.0.0"
  
 +[[package]]
 +name = "stable_deref_trait"
 +version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
  [[package]]
  name = "std"
  version = "0.0.0"
@@@ -1139,7 -1126,7 +1139,7 @@@ name = "xz2
  version = "0.1.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "lzma-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lzma-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -1173,14 -1160,13 +1173,14 @@@ source = "registry+https://github.com/r
  "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
  "checksum libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135"
  "checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad"
- "checksum lzma-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c5eaaa53b35fa17482ee2c001b04242827b47ae0faba72663fee3dee32366248"
+ "checksum lzma-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fedff6a5cbb24494ec6ee4784e9ac5c187161fede04c7767d49bf87544013afa"
  "checksum mdbook 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e2e9d848514dcfad4195788d0d42ae5153a477c191d75d5b84fab10f222fbd"
  "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
  "checksum miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "28eaee17666671fa872e567547e8428e83308ebe5808cdf6a0e28397dbe2c726"
  "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99"
  "checksum num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca313f1862c7ec3e0dfe8ace9fa91b1d9cb5c84ace3d00f5ec4216238e93c167"
  "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842"
 +"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
  "checksum pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8"
  "checksum pulldown-cmark 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9ab1e588ef8efd702c7ed9d2bd774db5e6f4d878bb5a1a9f371828fbdff6973"
  "checksum pulldown-cmark 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1058d7bb927ca067656537eec4e02c2b4b70eaaa129664c5b90c111e20326f41"
@@@ -1194,7 -1180,6 +1194,7 @@@
  "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
  "checksum serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a702319c807c016e51f672e5c77d6f0b46afddd744b5e437d6b8436b888b458f"
  "checksum serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)" = "dbc45439552eb8fb86907a2c41c1fd0ef97458efb87ff7f878db466eb581824e"
 +"checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
  "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
  "checksum tar 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ab0ef9ead2fe0aa9e18475a96a207bfd5143f4124779ef7429503a8665416ce8"
  "checksum term_size 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "07b6c1ac5b3fffd75073276bca1ceed01f67a28537097a2a9539e116e50fb21a"