diff options
| author | bors <bors@rust-lang.org> | 2016-02-22 07:08:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-22 07:08:25 +0000 |
| commit | 98a59cf57e02b6e6a5a3bd74eb47b1422eaacc53 (patch) | |
| tree | feff78f31b01458ebdebd5e846800010f9df6afb /src/libstd/sys | |
| parent | e628398f3464ef4bb60c3a05006064e1633e3d6f (diff) | |
| parent | e77c79e96d600b9179b1697037e1c0a52558c8f2 (diff) | |
| download | rust-98a59cf57e02b6e6a5a3bd74eb47b1422eaacc53.tar.gz rust-98a59cf57e02b6e6a5a3bd74eb47b1422eaacc53.zip | |
Auto merge of #31813 - nbaksalyar:solaris-fix, r=sanxiyn
A quick fix for several issues that break a Solaris/Illumos build. Also, adds a CPU target specification (as seen in a patch for OpenBSD #31727).
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/stack_overflow.rs | 3 |
1 files changed, 2 insertions, 1 deletions
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 } } |