make/lib/Lib-jdk.hotspot.agent.gmk

*** 1,7 ****
  #
! # Copyright (c) 2015, 2016, 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) 2015, 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
*** 96,111 ****
  endif
  
  ################################################################################
  
  $(eval $(call SetupNativeCompilation, BUILD_LIBSA, \
      TOOLCHAIN := $(SA_TOOLCHAIN), \
      OPTIMIZATION := NONE, \
      DISABLED_WARNINGS_microsoft := 4267, \
      DISABLED_WARNINGS_gcc := sign-compare, \
      DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
-     LIBRARY := $(SA_NAME), \
      OUTPUT_DIR := $(call FindLibDirForModule, $(MODULE)), \
      SRC := $(SA_SRC), \
      EXCLUDE_FILES := test.c saproc_audit.cpp $(SA_EXCLUDE_FILES), \
      CFLAGS := $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CUSTOM_CFLAGS), \
      CXXFLAGS := $(SA_INCLUDES) $(SA_CXXFLAGS) $(SA_CUSTOM_CXXFLAGS), \
--- 96,111 ----
  endif
  
  ################################################################################
  
  $(eval $(call SetupNativeCompilation, BUILD_LIBSA, \
+     NAME := $(SA_NAME), \
      TOOLCHAIN := $(SA_TOOLCHAIN), \
      OPTIMIZATION := NONE, \
      DISABLED_WARNINGS_microsoft := 4267, \
      DISABLED_WARNINGS_gcc := sign-compare, \
      DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
      OUTPUT_DIR := $(call FindLibDirForModule, $(MODULE)), \
      SRC := $(SA_SRC), \
      EXCLUDE_FILES := test.c saproc_audit.cpp $(SA_EXCLUDE_FILES), \
      CFLAGS := $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CUSTOM_CFLAGS), \
      CXXFLAGS := $(SA_INCLUDES) $(SA_CXXFLAGS) $(SA_CUSTOM_CXXFLAGS), \