diff options
| author | Jessica Hamilton <jessica.l.hamilton@gmail.com> | 2017-04-22 13:47:36 +1200 |
|---|---|---|
| committer | Jessica Hamilton <jessica.l.hamilton@gmail.com> | 2017-04-22 13:47:36 +1200 |
| commit | e1afddc29c7a056f855c0523e598c3bda42f4aea (patch) | |
| tree | 95870762437eac4965e3a6ebfcdb3c2e56fff34b /src | |
| parent | 535ee6c7f05e29a6e94edba06b228d64f8ba74ec (diff) | |
| download | rust-e1afddc29c7a056f855c0523e598c3bda42f4aea.tar.gz rust-e1afddc29c7a056f855c0523e598c3bda42f4aea.zip | |
Haiku: fix initial platform support
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_back/target/haiku_base.rs | 3 | ||||
| -rw-r--r-- | src/librustc_data_structures/flock.rs | 1 | ||||
| -rw-r--r-- | src/libunwind/build.rs | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/librustc_back/target/haiku_base.rs b/src/librustc_back/target/haiku_base.rs index bfdc9faaa8a..8e7f463563c 100644 --- a/src/librustc_back/target/haiku_base.rs +++ b/src/librustc_back/target/haiku_base.rs @@ -16,9 +16,10 @@ pub fn opts() -> TargetOptions { linker: "cc".to_string(), dynamic_linking: true, executables: true, - has_rpath: true, + has_rpath: false, target_family: Some("unix".to_string()), linker_is_gnu: true, + no_integrated_as: true, .. Default::default() } } diff --git a/src/librustc_data_structures/flock.rs b/src/librustc_data_structures/flock.rs index 26417e3ba7c..32f0fd41997 100644 --- a/src/librustc_data_structures/flock.rs +++ b/src/librustc_data_structures/flock.rs @@ -113,6 +113,7 @@ mod imp { pub l_sysid: libc::c_int, } + pub const F_RDLCK: libc::c_short = 0x0040; pub const F_UNLCK: libc::c_short = 0x0200; pub const F_WRLCK: libc::c_short = 0x0400; pub const F_SETLK: libc::c_int = 0x0080; diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs index 9b8099d55a0..be9aa6c5d40 100644 --- a/src/libunwind/build.rs +++ b/src/libunwind/build.rs @@ -39,5 +39,7 @@ fn main() { println!("cargo:rustc-link-lib=static-nobundle=pthread"); } else if target.contains("fuchsia") { println!("cargo:rustc-link-lib=unwind"); + } else if target.contains("haiku") { + println!("cargo:rustc-link-lib=gcc_s"); } } |