--- a/make/Main.gmk Wed May 30 09:50:14 2018 -0700
+++ b/make/Main.gmk Wed May 30 10:23:45 2018 -0700
@@ -186,7 +186,7 @@
ALL_TARGETS += $(ALL_COPY_TARGETS)
################################################################################
-# Targets for compiling all java modules. Nashorn is treated separately.
+# Targets for compiling all java modules.
JAVA_MODULES := $(ALL_MODULES)
JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
@@ -196,14 +196,7 @@
-f CompileJavaModules.gmk MODULE=$1)
endef
-$(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
- $(eval $(call DeclareCompileJavaRecipe,$m)))
-
-# Build nashorn. Needs to be compiled separately from the rest of the modules
-# due to nasgen.
-jdk.scripting.nashorn-java:
- +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
- -f BuildNashorn.gmk compile)
+$(foreach m, $(JAVA_MODULES), $(eval $(call DeclareCompileJavaRecipe,$m)))
ALL_TARGETS += $(JAVA_TARGETS)