8058797: Building with sjavac broken after JDK-8058118
Reviewed-by: ihse
This commit is contained in:
parent
1a2793f29e
commit
db75425e0a
make/common
@ -443,6 +443,7 @@ define SetupJavaCompilation
|
||||
# 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))
|
||||
|
@ -67,7 +67,8 @@ $(eval $(call SetupJavaCompilation,BUILD_GENMODULESLIST, \
|
||||
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" \
|
||||
|
Loading…
x
Reference in New Issue
Block a user