--- old/make/common/JavaCompilation.gmk 2014-09-19 10:43:35.458896174 +0200 +++ new/make/common/JavaCompilation.gmk 2014-09-19 10:43:35.366892459 +0200 @@ -443,6 +443,7 @@ # source roots from SRC. This is sometimes needed when compiling specific subsets of the source. # HEADERS:=path to directory where all generated c-headers are written. # DEPENDS:=Extra dependecy + # DISABLE_SJAVAC:=Explicitly disable the use of sjavac for this compilation unit. $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk)) --- old/make/common/Modules.gmk 2014-09-19 10:43:35.866912649 +0200 +++ new/make/common/Modules.gmk 2014-09-19 10:43:35.774908933 +0200 @@ -67,7 +67,8 @@ SETUP := BOOT_JAVAC, \ SRC := $(JDK_TOPDIR)/make/src/classes, \ INCLUDES := build/tools/module, \ - BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist)) + BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist, \ + DISABLE_SJAVAC := true)) TOOL_GENMODULESLIST = $(JAVA_SMALL) \ -cp "$(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist" \