make/hotspot/lib/JvmOverrideFiles.gmk
changeset 47217 72e3ae9a25eb
parent 47216 71c04702a3d5
child 47314 743814386712
--- a/make/hotspot/lib/JvmOverrideFiles.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/JvmOverrideFiles.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmOverrideFiles.gmk))
 
 ################################################################################
 # This file contains explicit overrides of CFLAGS and/or precompiled header
@@ -55,8 +55,8 @@
     # significantly reduce the GC pause time on 32 bit Linux/Unix platforms by
     # compiling without the PIC flag (-fPIC on linux).
     # See 6454213 for more details.
-    ALL_SRC := $(filter %.cpp, $(call CacheFind, $(HOTSPOT_TOPDIR)/src/share/vm))
-    NONPIC_FILTER := $(addsuffix %, $(addprefix $(HOTSPOT_TOPDIR)/src/share/vm/, \
+    ALL_SRC := $(filter %.cpp, $(call CacheFind, $(TOPDIR)/src/hotspot/share))
+    NONPIC_FILTER := $(addsuffix %, $(addprefix $(TOPDIR)/src/hotspot/share/, \
         memory oops gc))
     # Due to what looks like a bug in the old build implementation of this, add a
     # couple of more files that were accidentally matched as substrings of GC related