Handle feature=rustbuild

Taken from https://github.com/rust-lang/rust/pull/40347/files

And update rls-span to a version with the rustbuild boilerplate

diff --git a/src/Cargo.lock b/src/Cargo.lock
index 7e61014b1781288487d67a5e2375d9f9206aefdb..0670b1ce757e5044459d4f1c7e079a6272aaed5a 100644 (file)
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -419,7 +419,7 @@ dependencies = [
 [[package]]
 name = "rls-span"
 version = "0.1.0"
-source = "git+https://github.com/nrc/rls-span#e9224b1c52d1d43f9f7b3bb065653c9e18bb532d"
+source = "git+https://github.com/nrc/rls-span#79375240da727c583ce656a6beb034c163313399"
 dependencies = [
  "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index a996240f61650fa4e1af52feb76da79d2d9e2c65..5e6f3e9e6cc0feb20621aa7e7552d068613b9214 100644 (file)
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -79,6 +79,7 @@ fn main() {
     cmd.args(&args)
         .arg("--cfg")
         .arg(format!("stage{}", stage))
+        .arg("--cfg").arg("rustbuild")
         .env(bootstrap::util::dylib_path_var(),
              env::join_paths(&dylib_path).unwrap());