diff options
| author | bors <bors@rust-lang.org> | 2018-07-06 20:05:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-06 20:05:23 +0000 |
| commit | e06c875442e91cc2c597135d1e807a69e73eee26 (patch) | |
| tree | b68a271b1cd8f662d39b23e19c296b208c27335f /src/bootstrap | |
| parent | 3ea16c3493d1ed7bb085053d4362907ee8d72366 (diff) | |
| parent | bbe45ce584436ea23aeb9aec5871f7813f8c7476 (diff) | |
| download | rust-e06c875442e91cc2c597135d1e807a69e73eee26.tar.gz rust-e06c875442e91cc2c597135d1e807a69e73eee26.zip | |
Auto merge of #51757 - nielx:fix/haiku-fixes, r=nagisa
Haiku: several smaller fixes to build and run rust on Haiku This PR combines three small patches that help Rust build and run on the Haiku platform. These patches do not intend to impact other platforms.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 168cbde7e0d..5f66d0b102e 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -178,7 +178,7 @@ mod toolstate; #[cfg(windows)] mod job; -#[cfg(unix)] +#[cfg(all(unix, not(target_os = "haiku")))] mod job { use libc; @@ -189,7 +189,7 @@ mod job { } } -#[cfg(not(any(unix, windows)))] +#[cfg(any(target_os = "haiku", not(any(unix, windows))))] mod job { pub unsafe fn setup(_build: &mut ::Build) { } |