--- a/make/MainSupport.gmk Mon Sep 25 10:21:23 2017 +0200
+++ b/make/MainSupport.gmk Mon Sep 25 10:32:00 2017 +0200
@@ -36,7 +36,7 @@
($(CD) $(TOPDIR)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
JT_HOME=$(JT_HOME) PRODUCT_HOME=$(strip $2) \
TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \
- ALT_OUTPUTDIR=$(OUTPUT_ROOT) TEST_JOBS=$(TEST_JOBS) \
+ ALT_OUTPUTDIR=$(OUTPUTDIR) TEST_JOBS=$(TEST_JOBS) \
JT_JAVA=$(BOOT_JDK) JIB_JAR=$(JIB_JAR) \
JOBS=$(JOBS) $1) || true
endef
@@ -54,7 +54,7 @@
define CleanDir
@$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
@$(PRINTF) "\n" $(LOG_DEBUG)
- ($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
+ ($(CD) $(OUTPUTDIR) && $(RM) -r $1)
@$(PRINTF) " done\n"
endef