# HG changeset patch
# User redestad
# Date 1539944444 -7200
# Node ID 924fbbfdf07aa8df3201c382dbf9b3e1df21f27c
# Parent  3d4b9350fac2b949cd3cd47cf86e242c80a95aa4
JAVA_SMALL -> JAVA, comment out MICROBENCHMARK_RES

diff -r 3d4b9350fac2 -r 924fbbfdf07a make/test/BuildMicrobenchmark.gmk
--- a/make/test/BuildMicrobenchmark.gmk	Wed Oct 17 23:28:08 2018 +0200
+++ b/make/test/BuildMicrobenchmark.gmk	Fri Oct 19 12:20:44 2018 +0200
@@ -39,7 +39,8 @@
 #### Variables
 
 MICROBENCHMARK_SRC := $(TOPDIR)/test/micro/classes
-MICROBENCHMARK_RES := $(TOPDIR)/test/micro/resources
+# Uncomment this if/when resources are added
+#MICROBENCHMARK_RES := $(TOPDIR)/test/micro/resources
 MICROBENCHMARK_JAR := $(IMAGES_OUTPUTDIR)/test/micro/microbenchmarks.jar
 
 MICROBENCHMARK_OUTPUT := $(SUPPORT_OUTPUTDIR)/test/micro
@@ -68,7 +69,7 @@
 # Building microbenchmark requires the jdk.unsupported and java.management modules,
 # and to have sjavac disabled.
 $(eval $(call SetupJavaCompiler, MICROBENCHMARK_JAVA_COMPILER, \
-    JVM := $(JAVA_SMALL) --add-modules jdk.unsupported --limit-modules java.management, \
+    JVM := $(JAVA) --add-modules jdk.unsupported --limit-modules java.management, \
     JAVAC := $(NEW_JAVAC), \
     DISABLE_SJAVAC := true, \
     FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \