From 0fe69452ce429ddc8a715c8a3856ceb095ba7387 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Tue, 25 Apr 2017 16:48:26 +0000 Subject: [PATCH 1/2] Haiku: use LIBRARY_PATH in configure --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 55e9bb0dbb5..d4e0f9c05fb 100755 --- 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 From 3aaed3871c47b5bb904fadcafca4d65541ec33c0 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Tue, 25 Apr 2017 16:49:09 +0000 Subject: [PATCH 2/2] Haiku: doesn't have SIG_SYS --- src/cargo/util/errors.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs index 94f422f8d85..3b1d35b6eee 100644 --- 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", _ => "",