make/hotspot/lib/CompileGtest.gmk

*** 29,47 ****
  GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp
  GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest
  
  # On Windows, there are no internal debug symbols so must set copying to true
  # to get any at all.
! ifeq ($(OPENJDK_TARGET_OS), windows)
    GTEST_COPY_DEBUG_SYMBOLS := true
  else
    GTEST_COPY_DEBUG_SYMBOLS := false
  endif
  
  ################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    GTEST_JVM_MAPFILE := $(JVM_MAPFILE)
  else
    GTEST_JVM_MAPFILE := $(JVM_OUTPUTDIR)/gtest/mapfile
  
    $(JVM_OUTPUTDIR)/gtest/symbols: $(JVM_OUTPUTDIR)/symbols
--- 29,47 ----
  GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp
  GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest
  
  # On Windows, there are no internal debug symbols so must set copying to true
  # to get any at all.
! ifeq ($(call isTargetOs, windows), true)
    GTEST_COPY_DEBUG_SYMBOLS := true
  else
    GTEST_COPY_DEBUG_SYMBOLS := false
  endif
  
  ################################################################################
  
! ifeq ($(call isTargetOs, windows), true)
    GTEST_JVM_MAPFILE := $(JVM_MAPFILE)
  else
    GTEST_JVM_MAPFILE := $(JVM_OUTPUTDIR)/gtest/mapfile
  
    $(JVM_OUTPUTDIR)/gtest/symbols: $(JVM_OUTPUTDIR)/symbols