--- old/jdk/make/lib/Lib-jdk.sctp.gmk	2016-01-20 11:43:56.017322169 +0100
+++ new/jdk/make/lib/Lib-jdk.sctp.gmk	2016-01-20 11:43:55.717322153 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,38 +27,36 @@
 
 ################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
+ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris), )
+  # DISABLED_WARNINGS_gcc := unused-parameter needed to
+  # suppress unused parameters required by exported JNI functions.
+
+  $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
+      LIBRARY := sctp, \
+      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+      SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
+      OPTIMIZATION := LOW, \
+      CFLAGS := $(CFLAGS_JDKLIB) \
+          -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
+          -I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
+          $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
+          $(LIBJAVA_HEADER_FLAGS) \
+          -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \
+          -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+      DISABLED_WARNINGS_gcc := unused-parameter, \
+      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
+      LDFLAGS := $(LDFLAGS_JDKLIB) \
+          $(call SET_SHARED_LIBRARY_ORIGIN), \
+      LIBS_unix := -lnio -lnet -ljava -ljvm, \
+      LIBS_linux := -lpthread $(LIBDL), \
+      LIBS_solaris := -lsocket -lc, \
+      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
+  ))
 
-  ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix))
-    # DISABLED_WARNINGS_gcc := unused-parameter needed to
-    # suppress unused parameters required by exported JNI functions.
-
-    $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
-        LIBRARY := sctp, \
-        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-        SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
-        OPTIMIZATION := LOW, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
-            -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
-            -I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
-            $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
-            $(LIBJAVA_HEADER_FLAGS) \
-            -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
-        DISABLED_WARNINGS_gcc := unused-parameter, \
-        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
-        LDFLAGS := $(LDFLAGS_JDKLIB) \
-            $(call SET_SHARED_LIBRARY_ORIGIN), \
-        LIBS_unix := -lnio -lnet -ljava -ljvm, \
-        LIBS_linux := -lpthread $(LIBDL), \
-        LIBS_solaris := -lsocket -lc, \
-        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
-    ))
 
-    TARGETS += $(BUILD_LIBSCTP)
+  TARGETS += $(BUILD_LIBSCTP)
 
-    $(BUILD_LIBSCTP): $(call FindLib, java.base, nio)
-  endif
+  $(BUILD_LIBSCTP): $(call FindLib, java.base, nio)
 endif
 
 ################################################################################