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

8176469: Warnings from the build: Unknown module: jdk.rmic specified in --patch-module

Browse Source 
Reviewed-by: ihse, mchung
This commit is contained in:
Erik Joelsson 2017-03-13 09:51:59 +01:00
parent 39516da8ef
commit a083584001
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/make/rmic/RmicCommon.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -29,7 +29,7 @@ include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
include RMICompilation.gmk include RMICompilation.gmk
########################################################################################## ################################################################################
ifeq ($(BOOT_JDK_MODULAR), true) ifeq ($(BOOT_JDK_MODULAR), true)
RMIC_MAIN_CLASS := -m jdk.rmic/sun.rmi.rmic.Main RMIC_MAIN_CLASS := -m jdk.rmic/sun.rmi.rmic.Main
@ -37,12 +37,13 @@ else
RMIC_MAIN_CLASS := sun.rmi.rmic.Main RMIC_MAIN_CLASS := sun.rmi.rmic.Main
endif endif
RMIC := $(JAVA_SMALL) $(INTERIM_OVERRIDE_MODULES_ARGS) $(RMIC_MAIN_CLASS) RMIC := $(JAVA_SMALL) $(INTERIM_RMIC_OVERRIDE_MODULES_ARGS) $(RMIC_MAIN_CLASS)
CLASSES_DIR := $(JDK_OUTPUTDIR)/modules CLASSES_DIR := $(JDK_OUTPUTDIR)/modules
# NOTE: If the smart javac dependency management is reintroduced, these classes risk # NOTE: If the smart javac dependency management is reintroduced, these classes
# interfering with the dependency checking. In that case they will need to be kept separate. # risk interfering with the dependency checking. In that case they will need to
# be kept separate.
STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules
RMIC_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/rmic RMIC_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/rmic
########################################################################################## ################################################################################