8248547: Use SetupJdkLibrary for hotspot libraries

Reviewed-by: erikj
openjdk · Jun 30, 2020 · f19db79 · f19db79
1 parent 622117d
commit f19db79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
@@ -40,7 +40,7 @@ endif
 
 # Disabling all warnings in gtest source code
 
-$(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBGTEST, \
+$(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
     NAME := gtest, \
     TYPE := STATIC_LIBRARY, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
@@ -84,7 +84,7 @@ endif
 # Disabling undef, switch, format-nonliteral and tautological-undefined-compare
 # warnings for clang because of test source.
 
-$(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
+$(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
     NAME := jvm, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
@@ -127,7 +127,7 @@ TARGETS += $(BUILD_GTEST_LIBJVM)
 
 ################################################################################
 
-$(eval $(call SetupNativeCompilation, BUILD_GTEST_LAUNCHER, \
+$(eval $(call SetupJdkExecutable, BUILD_GTEST_LAUNCHER, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     NAME := gtestLauncher, \
     TYPE := EXECUTABLE, \

diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
@@ -146,7 +146,7 @@ $(call FillFindCache, $(JVM_SRC_DIRS))
 ################################################################################
 # Now set up the actual compilation of the main hotspot native library
 
-$(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
+$(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     NAME := jvm, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \

diff --git a/make/hotspot/lib/CompileLibraries.gmk b/make/hotspot/lib/CompileLibraries.gmk
@@ -27,7 +27,7 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
-include NativeCompilation.gmk
+include JdkNativeCompilation.gmk
 
 include HotspotCommon.gmk