make/hotspot/lib/CompileGtest.gmk

*** 1,7 ****
  #
! # Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 61,72 ****
  # But we want to avoid imposing -qpic=large onto the regular libjvm.so, which
  # has no problem with its TOC, so do this only for object files which are
  # exclusive to the gtest libjvm.so.
  
  $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     LIBRARY := jvm, \
      OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
      OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \
      SRC := $(GTEST_TEST_SRC), \
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := gtestLauncher.cpp, \
--- 61,72 ----
  # But we want to avoid imposing -qpic=large onto the regular libjvm.so, which
  # has no problem with its TOC, so do this only for object files which are
  # exclusive to the gtest libjvm.so.
  
  $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
+     NAME := jvm, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
      OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \
      SRC := $(GTEST_TEST_SRC), \
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := gtestLauncher.cpp, \
*** 105,115 ****
  
  ################################################################################
  
  $(eval $(call SetupNativeCompilation, BUILD_GTEST_LAUNCHER, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
!     PROGRAM := gtestLauncher, \
      OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
      EXTRA_FILES := $(GTEST_LAUNCHER_SRC), \
      OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/launcher-objs, \
      CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \
          -I$(GTEST_FRAMEWORK_SRC)/include, \
--- 105,116 ----
  
  ################################################################################
  
  $(eval $(call SetupNativeCompilation, BUILD_GTEST_LAUNCHER, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
!     NAME := gtestLauncher, \
!     TYPE := EXECUTABLE, \
      OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
      EXTRA_FILES := $(GTEST_LAUNCHER_SRC), \
      OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/launcher-objs, \
      CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \
          -I$(GTEST_FRAMEWORK_SRC)/include, \