make/lib/Lib-jdk.net.gmk

*** 33,51 ****
        LIBRARY := extnet, \
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
        SRC := $(TOPDIR)/src/jdk.net/solaris/native/libextnet, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
!       MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-vers, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := -lsocket -lc -ljava, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libextnet, \
    ))
  
    $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
  
    TARGETS += $(BUILD_LIBEXTNET)
  endif
  
  
  ################################################################################
--- 33,72 ----
        LIBRARY := extnet, \
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
        SRC := $(TOPDIR)/src/jdk.net/solaris/native/libextnet, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
!       MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-solaris, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := -lsocket -lc -ljava, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libextnet, \
    ))
  
    $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
  
+   TARGETS += $(BUILD_LIBEXTNET)
+ endif
+ 
+ 
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ 
+   $(eval $(call SetupNativeCompilation, BUILD_LIBEXTNET, \
+       LIBRARY := extnet, \
+       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+       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 -lc, \
+       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libextnet, \
+   ))
+ 
+   $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
+ 
    TARGETS += $(BUILD_LIBEXTNET)
  endif
  
  
  ################################################################################