about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-08 13:08:11 +0000
committerbors <bors@rust-lang.org>2017-07-08 13:08:11 +0000
commitac1b675c5820ff6f1a42c1fa6d592a7946337b2f (patch)
tree6366b55e0d7936218a630cc4c29359fa6736d64b
parent4d4d76cf42feceb4cdba5f219c15b8855ea37957 (diff)
parente084bb2abc7f318955f3d0b20b1398c5b393926f (diff)
downloadrust-ac1b675c5820ff6f1a42c1fa6d592a7946337b2f.tar.gz
rust-ac1b675c5820ff6f1a42c1fa6d592a7946337b2f.zip
Auto merge of #43104 - nbaksalyar:rustbuild-illumos-fix, r=sanxiyn
Fix Rustbuild linking on Illumos

Illumos (an OpenSolaris fork) expects to get several extra library references for some system functions used by Rust standard library. This commit adds required linker options to rustbuild, which is currently doesn't work on Illumos-based operating systems.
-rw-r--r--src/libstd/build.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs
index f84662c3f86..2abd47ab8df 100644
--- a/src/libstd/build.rs
+++ b/src/libstd/build.rs
@@ -41,6 +41,10 @@ fn main() {
     } else if target.contains("dragonfly") || target.contains("bitrig") ||
               target.contains("netbsd") || target.contains("openbsd") {
         println!("cargo:rustc-link-lib=pthread");
+    } else if target.contains("solaris") {
+        println!("cargo:rustc-link-lib=socket");
+        println!("cargo:rustc-link-lib=posix4");
+        println!("cargo:rustc-link-lib=pthread");
     } else if target.contains("apple-darwin") {
         println!("cargo:rustc-link-lib=System");