Mercurial > hg > jdk9-shenandoah
changeset 1307:9e57473496a4
8071781: Bootcycle build fails on macosx
Reviewed-by: ihse
author | erikj |
---|---|
date | Wed, 28 Jan 2015 15:45:00 +0100 |
parents | bb7c11ec0b20 |
children | d91ed1951b94 34e490baa2fb |
files | common/autoconf/bootcycle-spec.gmk.in |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/bootcycle-spec.gmk.in Wed Jan 28 14:04:05 2015 +0100 +++ b/common/autoconf/bootcycle-spec.gmk.in Wed Jan 28 15:45:00 2015 +0100 @@ -48,8 +48,9 @@ # The bootcycle build has a different output directory 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)) +# The HOTSPOT_DIST dir is not defined relative to BUILD_OUTPUT in spec.gmk. Must not +# use space in this patsubst to avoid leading space in HOTSPOT_DIST. +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