make/lib/Lib-jdk.net.gmk
branchihse-jdk-library-branch
changeset 56421 92bea2b7732a
parent 56311 e05b4241302b
parent 49440 396ea30afbd5
child 56433 c3cf838aa2da
equal deleted inserted replaced
56311:e05b4241302b 56421:92bea2b7732a
    25 
    25 
    26 include LibCommon.gmk
    26 include LibCommon.gmk
    27 
    27 
    28 ################################################################################
    28 ################################################################################
    29 
    29 
    30 ifeq ($(OPENJDK_TARGET_OS), solaris)
    30 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), )
    31 
    31 
    32   $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
    32   $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
    33       NAME := extnet, \
    33       NAME := extnet, \
    34       SRC := $(TOPDIR)/src/jdk.net/solaris/native/libextnet, \
    34       SRC := $(TOPDIR)/src/jdk.net/$(OPENJDK_TARGET_OS)/native/libextnet, \
    35       OPTIMIZATION := LOW, \
    35       OPTIMIZATION := LOW, \
    36       CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
    36       CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
    37       MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-solaris, \
       
    38       LDFLAGS := $(LDFLAGS_JDKLIB) \
    37       LDFLAGS := $(LDFLAGS_JDKLIB) \
    39           $(call SET_SHARED_LIBRARY_ORIGIN), \
    38           $(call SET_SHARED_LIBRARY_ORIGIN), \
    40       LIBS := -lsocket -ljava, \
    39       LIBS := -ljava, \
       
    40       LIBS_solaris := -lsocket, \
       
    41       LIBS_linux := -ljvm, \
    41   ))
    42   ))
    42 
    43 
    43   $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
    44   $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
    44 
    45 
    45   TARGETS += $(BUILD_LIBEXTNET)
    46   TARGETS += $(BUILD_LIBEXTNET)
    46 endif
    47 endif
    47 
    48 
    48 
       
    49 ifeq ($(OPENJDK_TARGET_OS), linux)
       
    50 
       
    51   $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
       
    52       NAME := extnet, \
       
    53       SRC := $(TOPDIR)/src/jdk.net/linux/native/libextnet, \
       
    54       OPTIMIZATION := LOW, \
       
    55       CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
       
    56       MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-linux, \
       
    57       LDFLAGS := $(LDFLAGS_JDKLIB) \
       
    58           $(call SET_SHARED_LIBRARY_ORIGIN), \
       
    59       LIBS := -ljvm -ljava, \
       
    60   ))
       
    61 
       
    62   $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
       
    63 
       
    64   TARGETS += $(BUILD_LIBEXTNET)
       
    65 endif
       
    66 
       
    67 
       
    68 ################################################################################
    49 ################################################################################