--- a/make/CompileToolsHotspot.gmk Tue Sep 12 19:03:39 2017 +0200
+++ b/make/CompileToolsHotspot.gmk Tue Sep 12 19:03:56 2017 +0200
@@ -35,12 +35,12 @@
TARGETS :=
# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, hotspot, CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/CompileTools.gmk))
ifeq ($(INCLUDE_GRAAL), true)
- VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.ci/share/classes
+ VM_CI_SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.ci/share/classes
- SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.compiler/share/classes
+ SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.compiler/share/classes
##############################################################################
# Compile the annotation processors