Mercurial > hg > jdk9-shenandoah
changeset 1303:291e59375885
8067479: verify-modules fails in bootcycle build
Reviewed-by: ihse, dholmes
author | erikj |
---|---|
date | Tue, 20 Jan 2015 13:56:35 +0100 |
parents | 243f16c4fae2 |
children | 668cf43ddeb5 |
files | common/autoconf/bootcycle-spec.gmk.in make/Main.gmk |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/bootcycle-spec.gmk.in Sun Jan 18 23:14:47 2015 -0800 +++ b/common/autoconf/bootcycle-spec.gmk.in Tue Jan 20 13:56:35 2015 +0100 @@ -46,8 +46,11 @@ BOOT_JDK := $(JDK_IMAGE_DIR) # The bootcycle build has a different output directory -BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build -SJAVAC_SERVER_DIR:=$(subst @BUILD_OUTPUT@,$(BUILD_OUTPUT),$(SJAVAC_SERVER_DIR)) +OLD_BUILD_OUTPUT:=@BUILD_OUTPUT@ +BUILD_OUTPUT:=$(OLD_BUILD_OUTPUT)/bootcycle-build +# The HOTSPOT_DIST dir is not defined relative to BUILD_OUTPUT in spec.gmk +HOTSPOT_DIST:=$(patsubst $(OLD_BUILD_OUTPUT)%, $(BUILD_OUTPUT)%, $(HOTSPOT_DIST)) +SJAVAC_SERVER_DIR:=$(patsubst $(OLD_BUILD_OUTPUT)%, $(BUILD_OUTPUT)%, $(SJAVAC_SERVER_DIR)) JAVA_CMD:=$(BOOT_JDK)/bin/java JAVAC_CMD:=$(BOOT_JDK)/bin/javac
--- a/make/Main.gmk Sun Jan 18 23:14:47 2015 -0800 +++ b/make/Main.gmk Tue Jan 20 13:56:35 2015 +0100 @@ -446,7 +446,7 @@ # alias for ease of use. jdk: exploded-image -images: test-image jimages demos samples zip-security +images: test-image jimages demos samples zip-security verify-modules ifeq ($(OPENJDK_TARGET_OS), macosx) images: mac-bundles