--- a/make/test/BuildTestLib.gmk Fri Apr 01 17:08:43 2016 +0200
+++ b/make/test/BuildTestLib.gmk Fri Apr 01 17:10:13 2016 +0200
@@ -38,7 +38,7 @@
$(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
SETUP := GENERATE_USINGJDKBYTECODE, \
SRC := $(TEST_LIB_SOURCE_DIR)/sun, \
- BIN := $(TEST_LIB_SUPPORT), \
+ BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
ADD_JAVAC_FLAGS := $(JAVAC_WARNINGS), \
))
@@ -49,7 +49,7 @@
$(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
SETUP := GENERATE_USINGJDKBYTECODE, \
SRC := $(TEST_LIB_SOURCE_DIR)/share/classes/jdk/test/lib/hprof, \
- BIN := $(TEST_LIB_SUPPORT), \
+ BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
))