Merge branch 'master' into gfio

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index aff4fba2251b2a2a387a7ef6557dd86e4e2d704e..4b19a593487e48f4aa9d78c5146a205df2d02a7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,10 +94,9 @@ ifeq ($(UNAME), Android)
   SOURCE += diskutil.c fifo.c blktrace.c trim.c profiles/tiobench.c
   LIBS += -ldl
   LDFLAGS += -rdynamic
-  CPPFLAGS += -DFIO_NO_HAVE_SHM_H
 endif
 ifeq ($(UNAME), SunOS)
-  LIBS  += -lpthread -ldl -laio -lrt -lnsl -lsocket
+  LIBS  += -lpthread -ldl
   CPPFLAGS += -D__EXTENSIONS__
 endif
 ifeq ($(UNAME), FreeBSD)