rust-lang · bors · Jul 6, 2017 · Mar 28, 2017 · Mar 17, 2017 · Mar 17, 2017
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -482,7 +482,9 @@ impl Build {
             }
         }
 
-        if self.config.extended && compiler.is_final_stage(self) {
+        if mode == Mode::Libstd &&
+           self.config.extended &&
+           compiler.is_final_stage(self) {
             cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string());
         }
 

diff --git a/src/doc/unstable-book/src/library-features/proc-macro.md b/src/doc/unstable-book/src/library-features/proc-macro.md
@@ -0,0 +1,7 @@
+# `proc_macro`
+
+The tracking issue for this feature is: [#38356]
+
+[#38356]: https://github.com/rust-lang/rust/issues/38356
+
+------------------------
diff --git a/src/libproc_macro/Cargo.toml b/src/libproc_macro/Cargo.toml
@@ -9,3 +9,4 @@ crate-type = ["dylib"]
 
 [dependencies]
 syntax = { path = "../libsyntax" }
+syntax_pos = { path = "../libsyntax_pos" }