make/lib/Lib-java.base.gmk
branchihse-cflags-rewrite-branch
changeset 56900 d5d542d50e3c
parent 56732 298e0b8056a3
parent 51825 e3632b4706c4
child 58665 30a5049a36bb
equal deleted inserted replaced
56899:2c5e7f347c49 56900:d5d542d50e3c
   127 ################################################################################
   127 ################################################################################
   128 # Create the jsig library
   128 # Create the jsig library
   129 
   129 
   130 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
   130 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
   131   ifeq ($(STATIC_BUILD), false)
   131   ifeq ($(STATIC_BUILD), false)
   132 
       
   133     LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
       
   134 
       
   135     ifeq ($(OPENJDK_TARGET_OS), linux)
       
   136       # FIXME: This is probably not what we want to do, but keep it now for compatibility.
       
   137       LIBJSIG_CFLAGS := $(EXPORT_ALL_SYMBOLS)
       
   138     endif
       
   139 
       
   140     $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
   132     $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
   141         NAME := jsig, \
   133         NAME := jsig, \
   142         CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
   134         CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
   143         LDFLAGS := $(LDFLAGS_JDKLIB) \
   135         LDFLAGS := $(LDFLAGS_JDKLIB) \
   144             $(call SET_SHARED_LIBRARY_ORIGIN), \
   136             $(call SET_SHARED_LIBRARY_ORIGIN), \
   145         LIBS_linux := $(LIBDL), \
   137         LIBS_linux := $(LIBDL), \
   146         LIBS_solaris := $(LIBDL), \
   138         LIBS_solaris := $(LIBDL), \
   147         LIBS_aix := $(LIBDL), \
   139         LIBS_aix := $(LIBDL), \
   148         MAPFILE := $(LIBJSIG_MAPFILE), \
       
   149     ))
   140     ))
   150 
   141 
   151     TARGETS += $(BUILD_LIBJSIG)
   142     TARGETS += $(BUILD_LIBJSIG)
   152 
   143 
   153     ############################################################################
   144     ############################################################################
   180 ################################################################################
   171 ################################################################################
   181 # Create the symbols file for static builds.
   172 # Create the symbols file for static builds.
   182 
   173 
   183 ifeq ($(STATIC_BUILD), true)
   174 ifeq ($(STATIC_BUILD), true)
   184   JAVA_BASE_EXPORT_SYMBOLS_SRC := \
   175   JAVA_BASE_EXPORT_SYMBOLS_SRC := \
   185       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli/$(LIBRARY_PREFIX)jli.symbols \
   176       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)jli.symbols \
   186       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)java.symbols \
   177       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)java.symbols \
   187       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)net.symbols \
   178       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)net.symbols \
   188       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)nio.symbols \
   179       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)nio.symbols \
   189       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)verify.symbols \
   180       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)verify.symbols \
   190       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)zip.symbols \
   181       $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)zip.symbols \
   203       $(BUILD_LIBNET) $(BUILD_LIBNIO) $(BUILD_LIBVERIFY) $(BUILD_LIBZIP) \
   194       $(BUILD_LIBNET) $(BUILD_LIBNIO) $(BUILD_LIBVERIFY) $(BUILD_LIBZIP) \
   204       $(BUILD_LIBJIMAGE)
   195       $(BUILD_LIBJIMAGE)
   205 
   196 
   206   TARGETS += $(JAVA_BASE_EXPORT_SYMBOL_FILE)
   197   TARGETS += $(JAVA_BASE_EXPORT_SYMBOL_FILE)
   207 endif
   198 endif
       
   199 
       
   200 ################################################################################
       
   201 # Copy tzmappings file for Windows
       
   202 
       
   203 ifeq ($(OPENJDK_TARGET_OS), windows)
       
   204   $(eval $(call SetupCopyFiles, COPY_TZMAPPINGS, \
       
   205       FILES := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/windows/conf/tzmappings, \
       
   206       DEST := $(call FindLibDirForModule, $(MODULE)), \
       
   207   ))
       
   208   TARGETS += $(COPY_TZMAPPINGS)
       
   209 endif