From: Twinaphex <libretro@gmail.com>
Date: Sun, 28 Jan 2018 05:30:13 +0000 (+0100)
Subject: Merge pull request #152 from kwyxz/master
X-Git-Tag: r24l~779
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea4f4384c24996e839106d515f000269b5cfc792;hp=f249ee4ae8972f52b88aa90939c935db47745b41;p=pcsx_rearmed.git

Merge pull request #152 from kwyxz/master

Fixed uname for Solaris + enabled Haiku build
---

diff --git a/Makefile.libretro b/Makefile.libretro
index a82a13ad..c9e27d8d 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -28,7 +28,11 @@ ifneq ($(GIT_VERSION)," unknown")
 endif
 LIBZ := -lz
 LIBPTHREAD := -lpthread
+ifneq ($(findstring Haiku,$(shell uname -s)),)
+LIBDL := -lroot -lnetwork
+else
 LIBDL := -ldl
+endif
 MMAP_WIN32=0
 EXTRA_LDFLAGS =
 
@@ -36,7 +40,7 @@ EXTRA_LDFLAGS =
 ifeq ($(platform), unix)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-ifneq ($(findstring SunOS,$(shell uname -a)),)
+ifneq ($(findstring SunOS,$(shell uname -s)),)
 	CC = gcc
 endif