1diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
2index 402fbcd..8fe2de2 100644
3--- a/src/librustc_back/target/mod.rs
4+++ b/src/librustc_back/target/mod.rs
5@@ -172,8 +172,8 @@ impl Default for TargetOptions {
6 /// incomplete, and if used for compilation, will certainly not work.
7 fn default() -> TargetOptions {
8 TargetOptions {
9- linker: "cc".to_string(),
10- ar: "ar".to_string(),
11+ linker: "@ccPath@".to_string(), // ignore-tidy-linelength
12+ ar: "@arPath@".to_string(), // ignore-tidy-linelength
13 pre_link_args: Vec::new(),
14 post_link_args: Vec::new(),
15 cpu: "generic".to_string(),
16diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
17index 2772fc8..3d37b08 100644
18--- a/src/test/run-pass/issue-20797.rs
19+++ b/src/test/run-pass/issue-20797.rs
20@@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> {
21 }
22
23 fn _foo() {
24- let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/home")).unwrap();
25+ let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/tmp")).unwrap();
26 }
27
28 fn main() {}