diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index a42f861..bda4bde 100644
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -172,8 +172,8 @@ impl Default for TargetOptions {
     /// incomplete, and if used for compilation, will certainly not work.
     fn default() -> TargetOptions {
         TargetOptions {
-            linker: "cc".to_string(),
-            ar: "ar".to_string(),
+            linker: "@ccPath@".to_string(), // ignore-tidy-linelength
+            ar: "@arPath@".to_string(), // ignore-tidy-linelength
             pre_link_args: Vec::new(),
             post_link_args: Vec::new(),
             cpu: "generic".to_string(),
diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
index 2772fc8..3d37b08 100644
--- a/src/test/run-pass/issue-20797.rs
+++ b/src/test/run-pass/issue-20797.rs
@@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> {
 }
 
 fn _foo() {
-    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/home")).unwrap();
+    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/tmp")).unwrap();
 }
 
 fn main() {}