Skip to content

Commit 994e552

Browse files
committed
Auto merge of #3952 - jessicah:haiku-support, r=alexcrichton
Haiku support
2 parents 2064245 + 3aaed38 commit 994e552

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ valopt local-rust-root "" "set prefix for local rust binary"
310310
if [ ! -z "${CFG_LOCAL_RUST_ROOT}" ]; then
311311
export LD_LIBRARY_PATH="${CFG_LOCAL_RUST_ROOT}/lib:$LD_LIBRARY_PATH"
312312
export DYLD_LIBRARY_PATH="${CFG_LOCAL_RUST_ROOT}/lib:$DYLD_LIBRARY_PATH"
313+
export LIBRARY_PATH="${CFG_LOCAL_RUST_ROOT}/lib:$LIBRARY_PATH"
313314
export PATH="${CFG_LOCAL_RUST_ROOT}/bin:$PATH"
314315
fi
315316

src/cargo/util/errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ pub fn process_error(msg: &str,
459459
libc::SIGSEGV => ", SIGSEGV: invalid memory reference",
460460
libc::SIGTERM => ", SIGTERM: termination signal",
461461
libc::SIGBUS => ", SIGBUS: access to undefined memory",
462+
#[cfg(not(target_os = "haiku"))]
462463
libc::SIGSYS => ", SIGSYS: bad system call",
463464
libc::SIGTRAP => ", SIGTRAP: trace/breakpoint trap",
464465
_ => "",

0 commit comments

Comments
 (0)