58c4bf5f20
That commit changed the patch to work for the new HEAD, but that new patch breaks 0.11. I made two patch for the two versions.
32 lines
1,009 B
Diff
32 lines
1,009 B
Diff
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
|
|
index 7a3e912..ced75fa 100644
|
|
--- a/src/librustc/back/link.rs
|
|
+++ b/src/librustc/back/link.rs
|
|
@@ -856,24 +856,15 @@
|
|
|
|
pub fn get_cc_prog(sess: &Session) -> String {
|
|
match sess.opts.cg.linker {
|
|
- Some(ref linker) => return linker.to_string(),
|
|
- None => {}
|
|
+ Some(ref linker) => linker.to_string(),
|
|
+ None => "@ccPath@".to_string()
|
|
}
|
|
-
|
|
- // In the future, FreeBSD will use clang as default compiler.
|
|
- // It would be flexible to use cc (system's default C compiler)
|
|
- // instead of hard-coded gcc.
|
|
- // For Windows, there is no cc command, so we add a condition to make it use gcc.
|
|
- match sess.targ_cfg.os {
|
|
- abi::OsWindows => "gcc",
|
|
- _ => "cc",
|
|
- }.to_string()
|
|
}
|
|
|
|
pub fn get_ar_prog(sess: &Session) -> String {
|
|
match sess.opts.cg.ar {
|
|
Some(ref ar) => (*ar).clone(),
|
|
- None => "ar".to_string()
|
|
+ None => "@arPath@".to_string()
|
|
}
|
|
}
|
|
|