about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2018-09-07 10:59:05 -0400
committerWho? Me?! <mark-i-m@users.noreply.github.com>2018-09-10 19:25:29 -0500
commit776fc2ad18e129ef6d6d7a7c8fc18d276c7c6c66 (patch)
tree37b952f85ac03c7e69d29b414c9794d0ca832c4a /src/doc/rustc-dev-guide
parent9c3d2ab8e79881236dc5ccf7a6b15d70786b8d08 (diff)
downloadrust-776fc2ad18e129ef6d6d7a7c8fc18d276c7c6c66.tar.gz
rust-776fc2ad18e129ef6d6d7a7c8fc18d276c7c6c66.zip
link to build-and-run, fix em-dash
Diffstat (limited to 'src/doc/rustc-dev-guide')
-rw-r--r--src/doc/rustc-dev-guide/src/how-to-build-and-run.md8
-rw-r--r--src/doc/rustc-dev-guide/src/profiling/with_perf.md4
2 files changed, 10 insertions, 2 deletions
diff --git a/src/doc/rustc-dev-guide/src/how-to-build-and-run.md b/src/doc/rustc-dev-guide/src/how-to-build-and-run.md
index 557fc9148ed..3ad9a52aed6 100644
--- a/src/doc/rustc-dev-guide/src/how-to-build-and-run.md
+++ b/src/doc/rustc-dev-guide/src/how-to-build-and-run.md
@@ -110,6 +110,8 @@ This is just a subset of the full rustc build. The **full** rustc build
 - Build libstd with stage2 compiler.
 - Build librustdoc and a bunch of other things.
 
+<a name=toolchain></a>
+
 ### Creating a rustup toolchain
 
 Once you have successfully built rustc, you will have created a bunch
@@ -125,6 +127,12 @@ to run the entire test suite).
 > rustup toolchain link stage2 build/<host-triple>/stage2
 ```
 
+The `<host-triple>` would typically be one of the following:
+
+- Linux: `x86_64-unknown-linux-gnu`
+- Mac: `x86_64-apple-darwin`
+- Windows: `x86_64-pc-windows-msvc`
+
 Now you can run the rustc you built with. If you run with `-vV`, you
 should see a version number ending in `-dev`, indicating a build from
 your local environment:
diff --git a/src/doc/rustc-dev-guide/src/profiling/with_perf.md b/src/doc/rustc-dev-guide/src/profiling/with_perf.md
index f0f6aada96c..740b0a2633a 100644
--- a/src/doc/rustc-dev-guide/src/profiling/with_perf.md
+++ b/src/doc/rustc-dev-guide/src/profiling/with_perf.md
@@ -12,7 +12,7 @@ This is a guide for how to profile rustc with [perf](https://perf.wiki.kernel.or
   - leave everything else the defaults
 - Run `./x.py build` to get a full build
 - Make a rustup toolchain (let's call it `rust-prof`) pointing to that result
-  - `rustup toolchain link <path-to-toolchain>`
+  - see [the "build and run" section for instructions](../how-to-build-and-run.html#toolchain)
   
 ## Gathering a perf profile
 
@@ -118,7 +118,7 @@ the `cargo rustc` command, like so:
 
 ```bash
 > touch src/lib.rs
-> CARGO_INCREMENTAL=0 perf record -F99 --call-graph dwarf cargo rustc --profile check --lib — -Zborrowck=mir
+> CARGO_INCREMENTAL=0 perf record -F99 --call-graph dwarf cargo rustc --profile check --lib -- -Zborrowck=mir
 ```
 
 [pf]: https://github.com/nikomatsakis/perf-focus