提交 1e8ade61 编写于 作者: J jlaskey

8008420: Fix Nashorn forest to build with NEWBUILD=false

Reviewed-by: jjh
Contributed-by: james.laskey@oracle.com
上级 a4abf819
...@@ -90,6 +90,7 @@ include ./make/corba-rules.gmk ...@@ -90,6 +90,7 @@ include ./make/corba-rules.gmk
include ./make/jaxp-rules.gmk include ./make/jaxp-rules.gmk
include ./make/jaxws-rules.gmk include ./make/jaxws-rules.gmk
include ./make/jdk-rules.gmk include ./make/jdk-rules.gmk
include ./make/nashorn-rules.gmk
include ./make/install-rules.gmk include ./make/install-rules.gmk
include ./make/sponsors-rules.gmk include ./make/sponsors-rules.gmk
include ./make/deploy-rules.gmk include ./make/deploy-rules.gmk
...@@ -174,6 +175,11 @@ ifeq ($(BUILD_JDK), true) ...@@ -174,6 +175,11 @@ ifeq ($(BUILD_JDK), true)
clobber:: jdk-clobber clobber:: jdk-clobber
endif endif
ifeq ($(BUILD_NASHORN), true)
generic_build_repo_series:: $(NASHORN)
clobber:: nashorn-clobber
endif
ifeq ($(BUILD_DEPLOY), true) ifeq ($(BUILD_DEPLOY), true)
generic_build_repo_series:: $(DEPLOY) generic_build_repo_series:: $(DEPLOY)
clobber:: deploy-clobber clobber:: deploy-clobber
...@@ -336,6 +342,7 @@ deploy_fastdebug_only: ...@@ -336,6 +342,7 @@ deploy_fastdebug_only:
BUILD_HOTSPOT=false \ BUILD_HOTSPOT=false \
BUILD_JDK=false \ BUILD_JDK=false \
BUILD_LANGTOOLS=false \ BUILD_LANGTOOLS=false \
BUILD_NASHORN=false \
BUILD_CORBA=false \ BUILD_CORBA=false \
BUILD_JAXP=false \ BUILD_JAXP=false \
BUILD_JAXWS=false \ BUILD_JAXWS=false \
......
...@@ -37,6 +37,9 @@ ifeq ($(BUILD_LANGTOOLS), true) ...@@ -37,6 +37,9 @@ ifeq ($(BUILD_LANGTOOLS), true)
NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST) NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
endif endif
# Default targets
NASHORN = nashorn-build
nashorn: nashorn-build nashorn: nashorn-build
nashorn-build: nashorn-build:
$(MKDIR) -p $(NASHORN_OUTPUTDIR) $(MKDIR) -p $(NASHORN_OUTPUTDIR)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册