stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Alejandro Murillo 2016-08-31 09:22:53 -07:00
commit 7a529a7794
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/CompileJavaModules.gmk
View File

@ -504,7 +504,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
$($(MODULE)_ADD_JAVAC_FLAGS) \ $($(MODULE)_ADD_JAVAC_FLAGS) \
--module-source-path $(MODULESOURCEPATH) \ --module-source-path $(MODULESOURCEPATH) \
--module-path $(MODULEPATH) \ --module-path $(MODULEPATH) \
-system none, \ --system none, \
)) ))
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA) TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)

3
make/Images.gmk
View File

@ -116,8 +116,10 @@ JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX) JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
JLINK_ORDER_RESOURCES := **module-info.class JLINK_ORDER_RESOURCES := **module-info.class
JLINK_JLI_CLASSES :=
ifeq ($(ENABLE_GENERATE_CLASSLIST), true) ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
endif endif
JLINK_ORDER_RESOURCES += \ JLINK_ORDER_RESOURCES += \
/java.base/java/** \ /java.base/java/** \
@ -131,6 +133,7 @@ JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \
--endian $(OPENJDK_BUILD_CPU_ENDIAN) \ --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
--release-info $(BASE_RELEASE_FILE) \ --release-info $(BASE_RELEASE_FILE) \
--order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
$(JLINK_JLI_CLASSES) \
# #
ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true) ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)

2
make/common/SetupJavaCompilers.gmk
View File

@ -88,7 +88,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \ $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
JVM := $(JAVA_SMALL), \ JVM := $(JAVA_SMALL), \
JAVAC := $(NEW_JAVAC), \ JAVAC := $(NEW_JAVAC), \
FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \ FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA))) SERVER_JVM := $(SJAVAC_SERVER_JAVA)))