Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jun 30, 2020
2 parents d05cd7d + f19db79 commit e20b3a3529f03b1763a78d8b0f8a5e873ef74b78
Showing with 5 additions and 5 deletions.
  1. +3 −3 make/hotspot/lib/CompileGtest.gmk
  2. +1 −1 make/hotspot/lib/CompileJvm.gmk
  3. +1 −1 make/hotspot/lib/CompileLibraries.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, \
@@ -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), \
@@ -27,7 +27,7 @@ default: all

include $(SPEC)
include MakeBase.gmk
include NativeCompilation.gmk
include JdkNativeCompilation.gmk

include HotspotCommon.gmk

0 comments on commit e20b3a3

Please sign in to comment.
You can’t perform that action at this time.