Partial support for Haiku (#3727)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 1871915..f8073c9 100644 (file)
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1428,7 +1428,7 @@ linkBinary dflags o_files dep_packages = do
 
     let
        thread_opts | WayThreaded `elem` ways = [ 
-#if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS)
+#if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS) && !defined(haiku_TARGET_OS)
                        "-lpthread"
 #endif
 #if defined(osf3_TARGET_OS)

diff --git a/configure.ac b/configure.ac
index a751e17..bc5c62b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -296,7 +296,7 @@ checkVendor() {
 
 checkOS() {
     case $1 in
-    linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+    linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
         ;;
     *)
         echo "Unknown OS '$1'"

diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c
index 34fcd5c..939eef1 100644 (file)
--- a/rts/posix/GetTime.c
+++ b/rts/posix/GetTime.c
@@ -153,7 +153,7 @@ Ticks getThreadCPUTime(void)
 nat
 getPageFaults(void)
 {
-#if !defined(HAVE_GETRUSAGE) || irix_HOST_OS
+#if !defined(HAVE_GETRUSAGE) || irix_HOST_OS || haiku_HOST_OS
     return 0;
 #else
     struct rusage t;