1.1 --- a/common/autoconf/spec.gmk.in Wed Oct 08 12:38:38 2014 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Mon Oct 13 11:34:14 2014 +0200
1.3 @@ -249,7 +249,6 @@
1.4
1.5 # The boot jdk to use
1.6 BOOT_JDK:=@BOOT_JDK@
1.7 -BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@
1.8 BOOT_RTJAR:=@BOOT_RTJAR@
1.9 BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar
1.10
1.11 @@ -436,9 +435,12 @@
1.12 POST_STRIP_CMD:=@POST_STRIP_CMD@
1.13 POST_MCS_CMD:=@POST_MCS_CMD@
1.14
1.15 -JAVA_FLAGS:=@BOOT_JDK_JVMARGS@
1.16 +JAVA_FLAGS:=@JAVA_FLAGS@
1.17 +JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
1.18 +JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
1.19
1.20 -JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS)
1.21 +JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
1.22 +JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
1.23
1.24 JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
1.25 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
1.26 @@ -451,7 +453,7 @@
1.27
1.28 RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic
1.29
1.30 -NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii
1.31 +NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii $(addprefix -J, $(JAVA_FLAGS_SMALL))
1.32
1.33 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner
1.34
