--- a/make/hotspot/gensrc/GensrcJfr.gmk	Fri Jul 13 11:07:43 2018 +0200
+++ b/make/hotspot/gensrc/GensrcJfr.gmk	Fri Jul 13 07:01:51 2018 -0700
@@ -27,7 +27,7 @@
 # Build tools needed for the JFR source code generation
 
 JFR_TOOLS_SRCDIR := $(TOPDIR)/make/src/classes
-JFR_TOOLS_OUTPUTDIR := $(OUTPUTDIR)/buildtools/tools_classes
+JFR_TOOLS_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/buildtools/tools_classes
 
 $(eval $(call SetupJavaCompiler, GENERATE_JFRBYTECODE, \
     JAVAC := $(JAVAC), \