From 9fed073494ec0bcbc376d73a927072f62c23c4bc Mon Sep 17 00:00:00 2001
From: asquared31415 <34665709+asquared31415@users.noreply.github.com>
Date: Fri, 5 Nov 2021 15:22:46 -0400
Subject: [PATCH 1/3] Add note to emphasize replacing TARGET_TRIPLE

---
 src/building/suggested.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/building/suggested.md b/src/building/suggested.md
index 24e25f5d0..664a15320 100644
--- a/src/building/suggested.md
+++ b/src/building/suggested.md
@@ -45,6 +45,12 @@ you can write: <!-- date: 2021-09 --><!-- the date comment is for the edition be
 in your `.vscode/settings.json` file. This will ask `rust-analyzer` to use
 `x.py check` to check the sources, and the stage 0 rustfmt to format them.
 
+> NOTE: Make sure to replace `TARGET_TRIPLE` in the `rust-analyzer.rustfmt.overrideCommand`
+> setting with the appropriate target triple for your machine. An example of such
+> a triple is `x86_64-unknown-linux-gnu`. An easy way to check the target triple
+> is looking in the `build` folder in the root of your rust clone after building the
+> compiler at least once. It will have a folder with the same name as your target triple.
+
 If you're running `coc.nvim`, you can use `:CocLocalConfig` to create a
 `.vim/coc-settings.json` and enter the same settings as above, but replacing
 `editor.formatOnSave: true,` with

From d700e887a2e732ed49492b90a3b737bfa1ae62f2 Mon Sep 17 00:00:00 2001
From: asquared31415 <34665709+asquared31415@users.noreply.github.com>
Date: Sat, 6 Nov 2021 03:30:22 -0400
Subject: [PATCH 2/3] Update suggested.md

---
 src/building/suggested.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/building/suggested.md b/src/building/suggested.md
index 664a15320..9b131385c 100644
--- a/src/building/suggested.md
+++ b/src/building/suggested.md
@@ -47,9 +47,8 @@ in your `.vscode/settings.json` file. This will ask `rust-analyzer` to use
 
 > NOTE: Make sure to replace `TARGET_TRIPLE` in the `rust-analyzer.rustfmt.overrideCommand`
 > setting with the appropriate target triple for your machine. An example of such
-> a triple is `x86_64-unknown-linux-gnu`. An easy way to check the target triple
-> is looking in the `build` folder in the root of your rust clone after building the
-> compiler at least once. It will have a folder with the same name as your target triple.
+> a triple is `x86_64-unknown-linux-gnu`. An easy way to check your target triple
+> is to run `rustc -vV` and checking the `host` value of its output.
 
 If you're running `coc.nvim`, you can use `:CocLocalConfig` to create a
 `.vim/coc-settings.json` and enter the same settings as above, but replacing

From 02157eccf42fd35a82b933a3c5d86bb48c48e9f3 Mon Sep 17 00:00:00 2001
From: asquared31415 <34665709+asquared31415@users.noreply.github.com>
Date: Sat, 6 Nov 2021 03:31:04 -0400
Subject: [PATCH 3/3] Make `TARGET_TRIPLE` use a `$` to signal placeholder

---
 src/building/suggested.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/building/suggested.md b/src/building/suggested.md
index 9b131385c..284317af7 100644
--- a/src/building/suggested.md
+++ b/src/building/suggested.md
@@ -32,7 +32,7 @@ you can write: <!-- date: 2021-09 --><!-- the date comment is for the edition be
         "--json-output"
     ],
     "rust-analyzer.rustfmt.overrideCommand": [
-        "./build/TARGET_TRIPLE/stage0/bin/rustfmt",
+        "./build/$TARGET_TRIPLE/stage0/bin/rustfmt",
         "--edition=2021"
     ],
     "editor.formatOnSave": true,