mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-22 16:26:05 +00:00
8008420: Fix Nashorn forest to build with NEWBUILD=false
Reviewed-by: jjh
This commit is contained in:
parent
383e963093
commit
eba603edcf
7
Makefile
7
Makefile
@ -90,6 +90,7 @@ include ./make/corba-rules.gmk
|
||||
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 @@ ifeq ($(BUILD_JDK), true)
|
||||
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 @@ deploy_fastdebug_only:
|
||||
BUILD_HOTSPOT=false \
|
||||
BUILD_JDK=false \
|
||||
BUILD_LANGTOOLS=false \
|
||||
BUILD_NASHORN=false \
|
||||
BUILD_CORBA=false \
|
||||
BUILD_JAXP=false \
|
||||
BUILD_JAXWS=false \
|
||||
|
||||
@ -37,6 +37,9 @@ ifeq ($(BUILD_LANGTOOLS), true)
|
||||
NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
|
||||
endif
|
||||
|
||||
# Default targets
|
||||
NASHORN = nashorn-build
|
||||
|
||||
nashorn: nashorn-build
|
||||
nashorn-build:
|
||||
$(MKDIR) -p $(NASHORN_OUTPUTDIR)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user