summaryrefslogtreecommitdiff
path: root/src/build_helper
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2017-10-10 23:06:22 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2017-10-15 22:10:07 +0300
commit9e0fc5ccd050201e77483b1efb2e6c76f47496f6 (patch)
treeb11fa90e3a2205b9add4ba0ffc8a3e38725c96e6 /src/build_helper
parent2689fd2402590961dae32f35369a8685c89022fb (diff)
downloadrust-9e0fc5ccd050201e77483b1efb2e6c76f47496f6.tar.gz
rustbuild: Support specifying archiver and linker explicitly
Diffstat (limited to 'src/build_helper')
-rw-r--r--src/build_helper/lib.rs21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs
index e81dab70b43..97723e260f6 100644
--- a/src/build_helper/lib.rs
+++ b/src/build_helper/lib.rs
@@ -138,27 +138,6 @@ pub fn gnu_target(target: &str) -> String {
}
}
-pub fn cc2ar(cc: &Path, target: &str) -> Option<PathBuf> {
- if target.contains("msvc") {
- None
- } else if target.contains("musl") {
- Some(PathBuf::from("ar"))
- } else if target.contains("openbsd") {
- Some(PathBuf::from("ar"))
- } else {
- let parent = cc.parent().unwrap();
- let file = cc.file_name().unwrap().to_str().unwrap();
- for suffix in &["gcc", "cc", "clang"] {
- if let Some(idx) = file.rfind(suffix) {
- let mut file = file[..idx].to_owned();
- file.push_str("ar");
- return Some(parent.join(&file));
- }
- }
- Some(parent.join(file))
- }
-}
-
pub fn make(host: &str) -> PathBuf {
if host.contains("bitrig") || host.contains("dragonfly") ||
host.contains("freebsd") || host.contains("netbsd") ||