Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8058797: Building with sjavac broken after JDK-8058118
authorerikj
Fri, 19 Sep 2014 11:53:01 +0200
changeset 26671 b214ab286ce9
parent 26668 1b1ec4291abc
child 26673 12957484d8c4
child 26676 2e2447371c67
8058797: Building with sjavac broken after JDK-8058118 Reviewed-by: ihse
make/common/JavaCompilation.gmk file | annotate | diff | comparison | revisions
make/common/Modules.gmk file | annotate | diff | comparison | revisions 
--- a/make/common/JavaCompilation.gmk	Wed Jul 05 20:01:50 2017 +0200
+++ b/make/common/JavaCompilation.gmk	Fri Sep 19 11:53:01 2014 +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))
--- a/make/common/Modules.gmk	Wed Jul 05 20:01:50 2017 +0200
+++ b/make/common/Modules.gmk	Fri Sep 19 11:53:01 2014 +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" \
jdk-sandbox