--- a/make/lib/Lib-jdk.net.gmk	Thu Mar 15 08:11:01 2018 -0700
+++ b/make/lib/Lib-jdk.net.gmk	Thu Mar 15 19:30:58 2018 +0100
@@ -27,17 +27,19 @@
 
 ################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), )
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
       NAME := extnet, \
-      SRC := $(TOPDIR)/src/jdk.net/solaris/native/libextnet, \
+      SRC := $(TOPDIR)/src/jdk.net/$(OPENJDK_TARGET_OS)/native/libextnet, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-solaris, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-$(OPENJDK_TARGET_OS), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS := -lsocket -ljava, \
+      LIBS := -ljava, \
+      LIBS_solaris := -lsocket, \
+      LIBS_linux := -ljvm, \
   ))
 
   $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
@@ -45,24 +47,4 @@
   TARGETS += $(BUILD_LIBEXTNET)
 endif
 
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
-      NAME := extnet, \
-      SRC := $(TOPDIR)/src/jdk.net/linux/native/libextnet, \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-linux, \
-      LDFLAGS := $(LDFLAGS_JDKLIB) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS := -ljvm -ljava, \
-  ))
-
-  $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
-
-  TARGETS += $(BUILD_LIBEXTNET)
-endif
-
-
 ################################################################################