changeset 2078:677465fa89aa

Fixed compilation error when importing modules
author erikj
date Wed, 18 Nov 2015 12:21:49 +0100
parents 48e940c6eece
children 903bd87f9402
files make/CompileJavaModules.gmk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Tue Nov 17 16:38:10 2015 +0100
+++ b/make/CompileJavaModules.gmk	Wed Nov 18 12:21:49 2015 +0100
@@ -572,7 +572,7 @@
 # use the macro to find the correct target file to depend on.
 # Only the javac compilation actually depends on other modules so limit
 # dependency declaration to that by using the *_COMPILE_TARGET variable.
-$($(MODULE)_COMPILE_TARGETS): $(foreach d, $(call FindDepsForModule, $(MODULE)), \
+$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \
     $(call SetupJavaCompilationCompileTarget, $d, \
         $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
 
@@ -611,7 +611,7 @@
 
   # Add this dependency to avoid a race between compiling module-info.java and
   # importing the classes.
-  $($(MODULE)_COMPILE_TARGETS): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
+  $($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
 endif
 
 ################################################################################