make/java/redist/Makefile
Print this page
@@ -56,10 +56,11 @@
JVMMAP_NAME = $(LIB_PREFIX)jvm.map
JVMPDB_NAME = $(LIB_PREFIX)jvm.pdb
LIBJSIG_NAME = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX)
JVMDB_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
JVMDTRACE_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX)
+JVMCFG_NAME = jvm.cfg
CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing
# Needed to do file copy
ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR))
@@ -76,20 +77,25 @@
# List of files created here or coming from BUILDDIR area (this workspace)
INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
# List of files coming from outside this workspace
IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
- $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
+ $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt \
+ $(LIBDIR)/$(LIBARCH)/$(JVMCFG_NAME)
# Hotspot client is only available on 32-bit non-Zero builds
ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
$(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
endif
endif
+# Get $(JVMCFG_NAME) files
+$(LIBDIR)/$(LIBARCH)/$(JVMCFG_NAME) : $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)/$(JVMCFG_NAME)
+ $(install-import-file)
+
ifeq ($(PLATFORM), windows)
# Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows
IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)