Auto merge of #3952 - jessicah:haiku-support, r=alexcrichton

Haiku support
rust-lang · Apr 25, 2017 · 994e552 · 994e552
2 parents 2064245 + 3aaed38
commit 994e552
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/configure b/configure
@@ -310,6 +310,7 @@ valopt local-rust-root "" "set prefix for local rust binary"
 if [ ! -z "${CFG_LOCAL_RUST_ROOT}" ]; then
     export LD_LIBRARY_PATH="${CFG_LOCAL_RUST_ROOT}/lib:$LD_LIBRARY_PATH"
     export DYLD_LIBRARY_PATH="${CFG_LOCAL_RUST_ROOT}/lib:$DYLD_LIBRARY_PATH"
+    export LIBRARY_PATH="${CFG_LOCAL_RUST_ROOT}/lib:$LIBRARY_PATH"
     export PATH="${CFG_LOCAL_RUST_ROOT}/bin:$PATH"
 fi
 

diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs
@@ -459,6 +459,7 @@ pub fn process_error(msg: &str,
                 libc::SIGSEGV => ", SIGSEGV: invalid memory reference",
                 libc::SIGTERM => ", SIGTERM: termination signal",
                 libc::SIGBUS => ", SIGBUS: access to undefined memory",
+                #[cfg(not(target_os = "haiku"))]
                 libc::SIGSYS => ", SIGSYS: bad system call",
                 libc::SIGTRAP => ", SIGTRAP: trace/breakpoint trap",
                 _ => "",