8008420: Fix Nashorn forest to build with NEWBUILD=false
Reviewed-by: jjh
Contributed-by: james.laskey@oracle.com
--- a/Makefile Wed Feb 06 13:37:03 2013 -0400
+++ b/Makefile Mon Feb 18 19:01:59 2013 -0400
@@ -90,6 +90,7 @@
include ./make/jaxp-rules.gmk
include ./make/jaxws-rules.gmk
include ./make/jdk-rules.gmk
+include ./make/nashorn-rules.gmk
include ./make/install-rules.gmk
include ./make/sponsors-rules.gmk
include ./make/deploy-rules.gmk
@@ -174,6 +175,11 @@
clobber:: jdk-clobber
endif
+ifeq ($(BUILD_NASHORN), true)
+ generic_build_repo_series:: $(NASHORN)
+ clobber:: nashorn-clobber
+endif
+
ifeq ($(BUILD_DEPLOY), true)
generic_build_repo_series:: $(DEPLOY)
clobber:: deploy-clobber
@@ -336,6 +342,7 @@
BUILD_HOTSPOT=false \
BUILD_JDK=false \
BUILD_LANGTOOLS=false \
+ BUILD_NASHORN=false \
BUILD_CORBA=false \
BUILD_JAXP=false \
BUILD_JAXWS=false \
--- a/make/nashorn-rules.gmk Wed Feb 06 13:37:03 2013 -0400
+++ b/make/nashorn-rules.gmk Mon Feb 18 19:01:59 2013 -0400
@@ -37,6 +37,9 @@
NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
endif
+# Default targets
+NASHORN = nashorn-build
+
nashorn: nashorn-build
nashorn-build:
$(MKDIR) -p $(NASHORN_OUTPUTDIR)