changeset 1224:4b33b1539e15

Properly fixing bootcycle-images
author erikj
date Thu, 02 Oct 2014 17:46:13 +0200
parents 517ba0a9d5e1
children bfa2277593b3
files common/autoconf/bootcycle-spec.gmk.in common/autoconf/spec.gmk.in
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/bootcycle-spec.gmk.in	Thu Oct 02 17:25:31 2014 +0200
+++ b/common/autoconf/bootcycle-spec.gmk.in	Thu Oct 02 17:46:13 2014 +0200
@@ -52,3 +52,9 @@
 BUILD_OUTPUT := @BUILD_OUTPUT@/bootcycle-build
 
 SJAVAC_SERVER_JAVA:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(SJAVAC_SERVER_JAVA))
+JAVA_COMMAND:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(JAVA_COMMAND))
+JAVAC:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(JAVAC))
+JAVAH:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(JAVAH))
+JAR:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(JAR))
+NATIVE2ASCII:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(NATIVE2ASCII))
+JARSIGNER:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(JARSIGNER))
--- a/common/autoconf/spec.gmk.in	Thu Oct 02 17:25:31 2014 +0200
+++ b/common/autoconf/spec.gmk.in	Thu Oct 02 17:46:13 2014 +0200
@@ -450,8 +450,10 @@
 JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
 JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@
 
-JAVA=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-JAVA_SMALL=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+# JAVA_COMMAND gets overridden in bootcycle-spec
+JAVA_COMMAND=@JAVA@
+JAVA=@FIXPATH@ $(JAVA_COMMAND) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+JAVA_SMALL=@FIXPATH@ $(JAVA_COMMAND) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
 
 JAVAC:=@FIXPATH@ @JAVAC@
 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid