jdk/make/lib/CoreLibraries.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, 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) 2011, 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
*** 267,277 ****
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
          -export:JIMAGE_PackageToModule \
          -export:JIMAGE_FindResource -export:JIMAGE_GetResource \
          -export:JIMAGE_ResourceIterator, \
!     LIBS_unix := -ljvm -ldl $(LIBCXX), \
      LIBS_solaris := -lc, \
      LIBS_macosx := -lc++, \
      LIBS_windows := jvm.lib, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
--- 267,277 ----
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
          -export:JIMAGE_PackageToModule \
          -export:JIMAGE_FindResource -export:JIMAGE_GetResource \
          -export:JIMAGE_ResourceIterator, \
!     LIBS_unix := -ljvm $(LIBDL) $(LIBCXX), \
      LIBS_solaris := -lc, \
      LIBS_macosx := -lc++, \
      LIBS_windows := jvm.lib, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
*** 441,452 ****
          $(call install-file)
  
      TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a
    endif
  
! else ifeq ($(OPENJDK_TARGET_OS), aix)
!   # AIX also requires a static libjli because the compiler doesn't support '-rpath'
    $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
        STATIC_LIBRARY := jli_static, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
        SRC := $(LIBJLI_SRC_DIRS), \
        EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
--- 441,453 ----
          $(call install-file)
  
      TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a
    endif
  
! else ifneq ($(filter $(OPENJDK_TARGET_OS_ENV), aix bsd.netbsd), )
!   # AIX and NetBSD also requires a static libjli because the compiler doesn't
!   # support '-rpath'
    $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
        STATIC_LIBRARY := jli_static, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
        SRC := $(LIBJLI_SRC_DIRS), \
        EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \