make/hotspot/lib/CompileJvm.gmk

*** 1,7 ****
  #
! # Copyright (c) 2013, 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) 2013, 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
*** 208,219 ****
  
  ################################################################################
  # Now set up the actual compilation of the main hotspot native library
  
  $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     LIBRARY := jvm, \
      OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
      SRC := $(JVM_SRC_DIRS), \
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \
      EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
--- 208,219 ----
  
  ################################################################################
  # Now set up the actual compilation of the main hotspot native library
  
  $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
+     NAME := jvm, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
      SRC := $(JVM_SRC_DIRS), \
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \
      EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \