--- a/common/autoconf/boot-jdk.m4	Sun Aug 10 19:38:50 2014 -0700
+++ b/common/autoconf/boot-jdk.m4	Sun Aug 17 15:51:37 2014 +0100
@@ -401,4 +401,10 @@
 
   JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
   AC_SUBST(JAVA_FLAGS_SMALL)
+
+  JAVA_TOOL_FLAGS_SMALL=""
+  for f in $JAVA_FLAGS_SMALL; do
+    JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f"
+  done
+  AC_SUBST(JAVA_TOOL_FLAGS_SMALL)
 ])