diff options
| author | Nikita Baksalyar <nikita.baksalyar@gmail.com> | 2016-02-22 01:57:24 +0300 |
|---|---|---|
| committer | Nikita Baksalyar <nikita.baksalyar@gmail.com> | 2016-02-22 01:58:49 +0300 |
| commit | e77c79e96d600b9179b1697037e1c0a52558c8f2 (patch) | |
| tree | 47a1b0bd799ee17e6f681d35dd430ae62a593139 | |
| parent | 0f62d219fbc02fc39f2fc4222d58ffb875c4900f (diff) | |
| download | rust-e77c79e96d600b9179b1697037e1c0a52558c8f2.tar.gz rust-e77c79e96d600b9179b1697037e1c0a52558c8f2.zip | |
Fix broken Solaris build
| -rw-r--r-- | src/librustc_back/target/x86_64_sun_solaris.rs | 1 | ||||
| -rw-r--r-- | src/libstd/os/solaris/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/stack_overflow.rs | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/librustc_back/target/x86_64_sun_solaris.rs b/src/librustc_back/target/x86_64_sun_solaris.rs index fbe3f5abc90..541c1306b33 100644 --- a/src/librustc_back/target/x86_64_sun_solaris.rs +++ b/src/librustc_back/target/x86_64_sun_solaris.rs @@ -13,6 +13,7 @@ use target::Target; pub fn target() -> Target { let mut base = super::solaris_base::opts(); base.pre_link_args.push("-m64".to_string()); + base.cpu = "x86-64".to_string(); Target { llvm_target: "x86_64-pc-solaris".to_string(), diff --git a/src/libstd/os/solaris/fs.rs b/src/libstd/os/solaris/fs.rs index 1c043af735a..5dc43d03a86 100644 --- a/src/libstd/os/solaris/fs.rs +++ b/src/libstd/os/solaris/fs.rs @@ -73,7 +73,7 @@ impl MetadataExt for Metadata { #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat { unsafe { - &*(self.as_inner().as_inner() as *const libc::stat64 + &*(self.as_inner().as_inner() as *const libc::stat as *const raw::stat) } } diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs index 1b5faf64ad6..1553aba35a2 100644 --- a/src/libstd/sys/unix/stack_overflow.rs +++ b/src/libstd/sys/unix/stack_overflow.rs @@ -157,7 +157,8 @@ mod imp { target_os = "macos", target_os = "bitrig", target_os = "netbsd", - target_os = "openbsd"))] + target_os = "openbsd", + target_os = "solaris"))] unsafe fn get_stack() -> libc::stack_t { libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ } } |